diff options
| author | Marc Zyngier <maz@misterjones.org> | 2006-08-23 15:50:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-08-23 15:50:57 -0700 |
| commit | 0f4184f73d5233214d3225a94fcf1bd4d6678d74 (patch) | |
| tree | 0aca57fc40523377916f0836506646205a0677eb /drivers/serial | |
| parent | 25848c4e502ec2bb94ee1f3c82709311059d0857 (diff) | |
[SERIAL] sunsab: Fix E250 console with RSC.
This fixes yet another sunsab problem, when console is set to anything
but the first port. The console framework calls sunsab_console_setup
for each port, and we end up setting up a console on a not yet
discovered port, which leads to an Oops. Instead, defer console setup
until the requested port is properly initialized. Tested on an E250
through an RSC console.
Reported by Daniel Smolik <marvin@mydatex.cz>
Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sunsab.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index dc673e1b6fd9..cfe20f730436 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -886,6 +886,15 @@ static int sunsab_console_setup(struct console *con, char *options) unsigned long flags; unsigned int baud, quot; + /* + * The console framework calls us for each and every port + * registered. Defer the console setup until the requested + * port has been properly discovered. A bit of a hack, + * though... + */ + if (up->port.type != PORT_SUNSAB) + return -1; + printk("Console: ttyS%d (SAB82532)\n", (sunsab_reg.minor - 64) + con->index); |