[PATCH -next] printk: fix broken 'console' kernel parameter

[PATCH -next] printk: fix broken 'console' kernel parameter

[Ming Lei]

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

Re: [PATCH -next] printk: fix broken 'console' kernel parameter

[Joe Perches]

On Tue, 2012-10-23 at 21:41 +0800, Ming Lei wrote:
> 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'.
[]
> diff --git 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;
>  }

Thanks, I'll wait a day or two for any more reports
then repost the whole series.

Re: [PATCH -next] printk: fix broken 'console' kernel parameter

[Fengguang Wu]

On Tue, Oct 23, 2012 at 09:41:18PM +0800, Ming Lei wrote:
> 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'.

Not sure if this is related, but I got an early crash with linux-next and
the first bad commit is

commit 10db96eb4942a011a76de8c98aabc4f132a882d9
Author: Joe Perches <joe@perches.com>
Date:   Tue Oct 23 13:50:17 2012 +1100

    printk: move braille console support into separate braille.[ch]
    files

Thanks,
Fengguang