Commit 2cfe6c4a authored Aug 05, 2013 by Steven Rostedt Committed by Linus Torvalds Aug 06, 2013

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 bbeddf52 "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>

parent 35114fcb

kernel/printk/braille.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message