]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sunsab: Do not set sunsab_reg.cons right before registering minors.
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Nov 2009 21:56:39 +0000 (13:56 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Dec 2009 21:43:59 +0000 (13:43 -0800)
[ 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>
drivers/serial/sunsab.c

index 0355efe115d98d73f1f68842e6dd3364a73d28b7..50088f957caa4d678ce811a908104297e8367489 100644 (file)
@@ -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);