diff options
| author | Vitaly Wool <vwool@ru.mvista.com> | 2006-11-16 01:19:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 11:43:37 -0800 |
| commit | 3b9c10dc59eaaef23e5a47110c20fb554f7dba28 (patch) | |
| tree | 021b7f3d9afa32cc15b0d78b598ee488e2cbdab2 | |
| parent | 84a763e3d1a47fa9308b8817f265e936e5f1000a (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>
| -rw-r--r-- | drivers/video/pnx4008/pnxrgbfb.c | 3 |
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) 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; |