Subject: [merged] printk-fix-return-of-braille_register_console.patch removed from -mm tree To: rostedt@xxxxxxxxxxx,joe@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 07 Aug 2013 13:07:57 -0700 The patch titled Subject: printk: fix return of braille_register_console() has been removed from the -mm tree. Its filename was printk-fix-return-of-braille_register_console.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Steven Rostedt <rostedt@xxxxxxxxxxx> Subject: 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 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@xxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/printk/braille.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN kernel/printk/braille.c~printk-fix-return-of-braille_register_console kernel/printk/braille.c --- a/kernel/printk/braille.c~printk-fix-return-of-braille_register_console +++ a/kernel/printk/braille.c @@ -19,7 +19,8 @@ char *_braille_console_setup(char **str, pr_err("need port name after brl=\n"); else *((*str)++) = 0; - } + } else + return NULL; return *str; } _ Patches currently in -mm which might be from rostedt@xxxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html