From: Peter Hurley <peter@hurleysoftware.com>
Date: Sun, 1 Mar 2015 16:05:47 +0000 (-0500)
Subject: console: Preserve index after console setup()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f427c990e2d0fd30336b0c252aa7e38e4cffdea2;p=linux-beck.git

console: Preserve index after console setup()

Before register_console() calls the setup() method of the matched
console, the registering console index is already equal to the index
from the console command line; ie. newcon->index == c->index.

This change is also required to support extensible console matching;
(the command line index may have no relation to the console index
assigned by the console-defined match() function).

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 01cfd69c54c6..d261a7e5f51a 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2479,7 +2479,6 @@ void register_console(struct console *newcon)
 		    newcon->setup(newcon, console_cmdline[i].options) != 0)
 			break;
 		newcon->flags |= CON_ENABLED;
-		newcon->index = c->index;
 		if (i == selected_console) {
 			newcon->flags |= CON_CONSDEV;
 			preferred_console = selected_console;