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 <a...@linux-foundation.org>
Cc: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Cc: Joe Perches <j...@perches.com>
Signed-off-by: Ming Lei <ming....@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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
