diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-12-17 05:16:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-06 13:44:11 -0500 |
commit | 568389c257fa7d74ce36c2f78bad31965fded4cf (patch) | |
tree | dc8ac314514f03b29675ae99957961d4cb71f7a6 /drivers/serial | |
parent | b7b8de087384cc1954a8cd075af3f9e5977caa2e (diff) |
serial: apbuart: Fixup apbuart_console_init()
commit 35c64e5d (drivers: serial: apbuart: Handle OF failures
gracefully) missed that the modified grlib_apbuart_configure()
function is called from apbuart_console_init() as well.
Fix the fallout.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/apbuart.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c index 2e84d9c3d419..a30bb9620c9b 100644 --- a/drivers/serial/apbuart.c +++ b/drivers/serial/apbuart.c | |||
@@ -520,11 +520,12 @@ static struct console grlib_apbuart_console = { | |||
520 | }; | 520 | }; |
521 | 521 | ||
522 | 522 | ||
523 | static void grlib_apbuart_configure(void); | 523 | static int grlib_apbuart_configure(void); |
524 | 524 | ||
525 | static int __init apbuart_console_init(void) | 525 | static int __init apbuart_console_init(void) |
526 | { | 526 | { |
527 | grlib_apbuart_configure(); | 527 | if (grlib_apbuart_configure()) |
528 | return -ENODEV; | ||
528 | register_console(&grlib_apbuart_console); | 529 | register_console(&grlib_apbuart_console); |
529 | return 0; | 530 | return 0; |
530 | } | 531 | } |