From: David S. Miller <davem@davemloft.net>
Date: Tue, 24 Nov 2009 21:56:39 +0000 (-0800)
Subject: sunsab: Do not set sunsab_reg.cons right before registering minors.
X-Git-Tag: v2.6.31.9~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=313775a1ae8d7d951810e173ce9295f07e5f2f78;p=thirdparty%2Fkernel%2Fstable.git

sunsab: Do not set sunsab_reg.cons right before registering minors.

[ Upstream commit 4e68e188411ea98e40309700cf0c89ad4469ac1d ]

Other Sun serial drivers do not do this, and if we keep it this way
it ends up registering all serial devices as consoles rather than
just the one which we explicitly register via sunserial_console_match()
which uses add_preferred_console().

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 0355efe115d98..50088f957caa4 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -1116,7 +1116,6 @@ static int __init sunsab_init(void)
 		if (!sunsab_ports)
 			return -ENOMEM;
 
-		sunsab_reg.cons = SUNSAB_CONSOLE();
 		err = sunserial_register_minors(&sunsab_reg, num_channels);
 		if (err) {
 			kfree(sunsab_ports);