path: root/kernel
diff options
authorSteven Rostedt <rostedt@goodmis.org>2013-08-05 22:55:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-06 13:18:12 -0700
commit2cfe6c4ac7ee0193780d655c5dea5a73acae1f46 (patch)
treee27fcd6a45b1c736f4b62ceee3b009563ee288e4 /kernel
parentRevert "ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child)" (diff)
printk: Fix return of braille_register_console()
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. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Acked-by: Joe Perches <joe@perches.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c
index b51087fb9ace..276762f3a460 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");
*((*str)++) = 0;
- }
+ } else
+ return NULL;
return *str;