lkml.org 
[lkml]   [2012]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH -next] printk: fix broken 'console' kernel parameter
Date
If CONFIG_A11Y_BRAILLE_CONSOLE is not enabled, _braille_console_setup()
should return NULL to parse the parameter further in console_setup().

This patch fixes the broken 'console' kernel parameter, which makes the
Pandaboard not boot with 'console=ttyO2'.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Joe Perches <joe@perches.com>

Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
kernel/printk/braille.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/printk/braille.h b/kernel/printk/braille.h
index d2e6bc3..769d771 100644
--- a/kernel/printk/braille.h
+++ b/kernel/printk/braille.h
@@ -28,7 +28,7 @@ braille_set_options(struct console_cmdline *c, char *brl_options)
static inline char *
_braille_console_setup(char **str, char **brl_options)
{
- return *str;
+ return NULL;
}

static inline int
--
1.7.9.5


\
 
 \ /
  Last update: 2012-10-23 16:21    [W:0.056 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site