summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-24 13:56:39 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-18 13:43:59 -0800
commit313775a1ae8d7d951810e173ce9295f07e5f2f78 (patch)
tree5add170226352d218e1fba1f5af5d0f6df918fdf
parentbcb7797d596b725c2b6b11f24b9254385297261f (diff)
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>
-rw-r--r--drivers/serial/sunsab.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 0355efe115d9..50088f957caa 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);