diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 05:14:08 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 05:14:08 +0400 |
| commit | 19147d0eb1472eac690a9a708893d4de096bbfcf (patch) | |
| tree | 7d68cc017199365b224c072130e64bfd929f7703 /drivers | |
| parent | 2a6a432a9ce55876b92f9ea860d7baa05538de16 (diff) | |
| parent | 86fa04b8742ac681d470786f55e2403ada0075b2 (diff) | |
| download | linux-19147d0eb1472eac690a9a708893d4de096bbfcf.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix atomic64_t routine return values.
sparc64: Fix rwsem constant bug leading to hangs.
sparc: Hook up new fanotify and prlimit64 syscalls.
sparc: Really fix "console=" for serial consoles.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/suncore.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c index 544f2e25d0e5..6381a0282ee7 100644 --- a/drivers/serial/suncore.c +++ b/drivers/serial/suncore.c @@ -55,7 +55,12 @@ EXPORT_SYMBOL(sunserial_unregister_minors); int sunserial_console_match(struct console *con, struct device_node *dp, struct uart_driver *drv, int line, bool ignore_line) { - if (!con || of_console_device != dp) + if (!con) + return 0; + + drv->cons = con; + + if (of_console_device != dp) return 0; if (!ignore_line) { @@ -69,12 +74,10 @@ int sunserial_console_match(struct console *con, struct device_node *dp, return 0; } - con->index = line; - drv->cons = con; - - if (!console_set_on_cmdline) + if (!console_set_on_cmdline) { + con->index = line; add_preferred_console(con->name, line, NULL); - + } return 1; } EXPORT_SYMBOL(sunserial_console_match); |