---

yaml --- r: 40939 b: refs/heads/master c: 3b9c10d h: refs/heads/master i: 40937: 3bc6c19 40935: ca6adf7 v: v3
git-mirror · Nov 16, 2006 · f152187 · f152187
1 parent dc6d157
commit f152187
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: 84a763e3d1a47fa9308b8817f265e936e5f1000a
+refs/heads/master: 3b9c10dc59eaaef23e5a47110c20fb554f7dba28
diff --git a/trunk/drivers/video/pnx4008/pnxrgbfb.c b/trunk/drivers/video/pnx4008/pnxrgbfb.c
@@ -154,7 +154,8 @@ static int __devinit rgbfb_probe(struct platform_device *pdev)
 			goto err1;
 	}
 
-	if (!fb_get_options("pnxrgbfb", &option) && !strcmp(option, "nocursor"))
+	if (!fb_get_options("pnxrgbfb", &option) && option &&
+			!strcmp(option, "nocursor"))
 		rgbfb_ops.fb_cursor = no_cursor;
 
 	info->node = -1;