projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
printk
/
braille.c
diff --git
a/kernel/printk/braille.c
b/kernel/printk/braille.c
index b51087fb9acec5a33d8ee53b37206b7fdbd770b1..276762f3a46078141117e5810c1afc964e869ec9 100644
(file)
--- 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");
else
*((*str)++) = 0;
- }
+ } else
+ return NULL;
return *str;
}