Skip to content

Commit

Permalink
serial: apbuart: Fixup apbuart_console_init()
Browse files Browse the repository at this point in the history
commit 35c64e5 (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>
  • Loading branch information
Thomas Gleixner authored and Greg Kroah-Hartman committed Jan 6, 2011
1 parent b7b8de0 commit 568389c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/serial/apbuart.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,11 +520,12 @@ static struct console grlib_apbuart_console = {
};


static void grlib_apbuart_configure(void);
static int grlib_apbuart_configure(void);

static int __init apbuart_console_init(void)
{
grlib_apbuart_configure();
if (grlib_apbuart_configure())
return -ENODEV;
register_console(&grlib_apbuart_console);
return 0;
}
Expand Down

0 comments on commit 568389c

Please sign in to comment.