lkml.org 
[lkml]   [2013]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] printk: Fix return of braille_register_console()
From
Date
On Mon, 2013-08-05 at 22:55 -0400, Steven Rostedt wrote:
> Some of my configs I test with have CONFIG_A11Y_BRAILLE_CONSOLE set.
> When I started testing against v3.11-rc4 my console went bonkers. Using
> ktest to bisect the issue, it came down to:
>
> commit bbeddf52a "printk: move braille console support into separate
> braille.[ch] files"
>
> Looking into the patch I found the problem. It's with the return of
> braille_register_console(). As anything other than NULL is considered a
> failure.
>
> But for those of us that have CONFIG_A11Y_BRAILLE_CONSOLE set but do not
> define a "brl" or "brl=" on the command line, we still may want a
> console that those with sight can still use.
>
> Return NULL (success) if "brl" or "brl=" is not on the console line.

Thanks Steven.

> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>
> diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c
> index b51087f..276762f 100644
> --- a/kernel/printk/braille.c
> +++ b/kernel/printk/braille.c
> @@ -19,7 +19,8 @@ char *_braille_console_setup(char **str, char **brl_options)
> pr_err("need port name after brl=\n");
> else
> *((*str)++) = 0;
> - }
> + } else
> + return NULL;
>
> return *str;
> }
>
>
>





\
 
 \ /
  Last update: 2013-08-06 05:41    [W:0.055 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site