aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/pnx4008/pnxrgbfb.c
diff options
context:
space:
mode:
authorVitaly Wool <vwool@ru.mvista.com>2006-11-16 04:19:14 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 14:43:37 -0500
commit3b9c10dc59eaaef23e5a47110c20fb554f7dba28 (patch)
tree021b7f3d9afa32cc15b0d78b598ee488e2cbdab2 /drivers/video/pnx4008/pnxrgbfb.c
parent84a763e3d1a47fa9308b8817f265e936e5f1000a (diff)
[PATCH] pnx4008:fix NULL dereference in rgbfb
Fix possible NULL dereference in pnxrgbfb. Signed-off-by: Vitaly Wool <vwool@ru.mvista.com> Cc: James Simmons <jsimmons@infradead.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/pnx4008/pnxrgbfb.c')
-rw-r--r--drivers/video/pnx4008/pnxrgbfb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c
index bf36b68856dd..f29e66e2d774 100644
--- a/drivers/video/pnx4008/pnxrgbfb.c
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@@ -154,7 +154,8 @@ static int __devinit rgbfb_probe(struct platform_device *pdev)
154 goto err1; 154 goto err1;
155 } 155 }
156 156
157 if (!fb_get_options("pnxrgbfb", &option) && !strcmp(option, "nocursor")) 157 if (!fb_get_options("pnxrgbfb", &option) && option &&
158 !strcmp(option, "nocursor"))
158 rgbfb_ops.fb_cursor = no_cursor; 159 rgbfb_ops.fb_cursor = no_cursor;
159 160
160 info->node = -1; 161 info->node = -1;