1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 7b4cd250bec8..9fc10b9e6f57 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1396,7 +1396,8 @@ static struct platform_driver pxafb_driver = {
 int __devinit pxafb_setup(char *options)
 {
 # ifdef CONFIG_FB_PXA_PARAMETERS
-        strlcpy(g_options, options, sizeof(g_options));
+        if (options)
+                strlcpy(g_options, options, sizeof(g_options));
 # endif
         return 0;
 }