Commit fb79ffa4 authored by Ole Reinhardt's avatar Ole Reinhardt Committed by Linus Torvalds

[PATCH] fbdev: make pxafb more robust to errors with CONFIG_FB_PXA_PARAMETERS

pxafb.c runs into an oops if CONFIG_FB_PXA_PARAMETERS is enabled and no
parameters are set in command line.  The following patch avoids this
problem.
Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 118c71bc
...@@ -1396,6 +1396,7 @@ static struct platform_driver pxafb_driver = { ...@@ -1396,6 +1396,7 @@ static struct platform_driver pxafb_driver = {
int __devinit pxafb_setup(char *options) int __devinit pxafb_setup(char *options)
{ {
# ifdef CONFIG_FB_PXA_PARAMETERS # ifdef CONFIG_FB_PXA_PARAMETERS
if (options)
strlcpy(g_options, options, sizeof(g_options)); strlcpy(g_options, options, sizeof(g_options));
# endif # endif
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment