mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-19 02:34:01 +08:00
ae6c33ba6e
Commitbbeddf52ad("printk: move braille console support into separate braille.[ch] files") moved the parsing of braille-related options into _braille_console_setup(), changing the type of variable str from char* to char**. In this commit, memcmp(str, "brl,", 4) was correctly updated to memcmp(*str, "brl,", 4) but not memcmp(str, "brl=", 4). Update the code to make "brl=" option work again and replace memcmp() with strncmp() to make the compiler able to detect such an issue. Fixes:bbeddf52ad("printk: move braille console support into separate braille.[ch] files") Link: http://lkml.kernel.org/r/20160823165700.28952-1-nicolas.iooss_linux@m4x.org Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
50 lines
948 B
C
50 lines
948 B
C
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/console.h>
|
|
#include <linux/string.h>
|
|
|
|
#include "console_cmdline.h"
|
|
#include "braille.h"
|
|
|
|
char *_braille_console_setup(char **str, char **brl_options)
|
|
{
|
|
if (!strncmp(*str, "brl,", 4)) {
|
|
*brl_options = "";
|
|
*str += 4;
|
|
} else if (!strncmp(*str, "brl=", 4)) {
|
|
*brl_options = *str + 4;
|
|
*str = strchr(*brl_options, ',');
|
|
if (!*str)
|
|
pr_err("need port name after brl=\n");
|
|
else
|
|
*((*str)++) = 0;
|
|
} else
|
|
return NULL;
|
|
|
|
return *str;
|
|
}
|
|
|
|
int
|
|
_braille_register_console(struct console *console, struct console_cmdline *c)
|
|
{
|
|
int rtn = 0;
|
|
|
|
if (c->brl_options) {
|
|
console->flags |= CON_BRL;
|
|
rtn = braille_register_console(console, c->index, c->options,
|
|
c->brl_options);
|
|
}
|
|
|
|
return rtn;
|
|
}
|
|
|
|
int
|
|
_braille_unregister_console(struct console *console)
|
|
{
|
|
if (console->flags & CON_BRL)
|
|
return braille_unregister_console(console);
|
|
|
|
return 0;
|
|
}
|