From d13f42dd3cdb762b9f0ff391e96988f5835b87c1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 26 Jan 2012 14:16:09 +0100 Subject: console simple: return with a proper error value There can be only one console for console_simple, so return with -EBUSY when the second gets registered. Signed-off-by: Sascha Hauer --- common/console_simple.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'common/console_simple.c') diff --git a/common/console_simple.c b/common/console_simple.c index 49c5b33fce..7ad88d9a99 100644 --- a/common/console_simple.c +++ b/common/console_simple.c @@ -155,13 +155,15 @@ EXPORT_SYMBOL(ctrlc); int console_register(struct console_device *newcdev) { - if (!console) { - console = newcdev; - console_list.prev = console_list.next = &newcdev->list; - newcdev->list.prev = newcdev->list.next = &console_list; + if (console) + return -EBUSY; + + console = newcdev; + console_list.prev = console_list.next = &newcdev->list; + newcdev->list.prev = newcdev->list.next = &console_list; + + barebox_banner(); - barebox_banner(); - } return 0; } -- cgit v1.2.3