---

yaml --- r: 15116 b: refs/heads/master c: fb79ffa h: refs/heads/master v: v3
git-mirror · Dec 14, 2005 · beaf9d0 · beaf9d0
1 parent 36b5f0e
commit beaf9d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 118c71bcacce82a4317c9bd99c6a15af14020aee
+refs/heads/master: fb79ffa4ddbe3f6f30fdb8429b5bad84d25ae6ef
diff --git a/trunk/drivers/video/pxafb.c b/trunk/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;
 }