From f15218715417f09313caa365488b182e99f262d6 Mon Sep 17 00:00:00 2001
From: Vitaly Wool <vwool@ru.mvista.com>
Date: Thu, 16 Nov 2006 01:19:14 -0800
Subject: [PATCH] --- yaml --- r: 40939 b: refs/heads/master c:
 3b9c10dc59eaaef23e5a47110c20fb554f7dba28 h: refs/heads/master i:   40937:
 3bc6c19a9afe51f4f9be5e5532dfce7297eb84c5   40935:
 ca6adf74c0b7c8ba361343688daeaba9c00fa289 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/video/pnx4008/pnxrgbfb.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 126acadb58bd..cf5cf357eb3a 100644
--- 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
index bf36b68856dd..f29e66e2d774 100644
--- 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;