git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
video
/
pnx4008
/
pnxrgbfb.c
diff --git
a/drivers/video/pnx4008/pnxrgbfb.c
b/drivers/video/pnx4008/pnxrgbfb.c
index
7d9453c
..
f29e66e
100644
(file)
--- 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;
}
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;
rgbfb_ops.fb_cursor = no_cursor;
info->node = -1;
@@
-191,7
+192,7
@@
err:
static struct platform_driver rgbfb_driver = {
.driver = {
static struct platform_driver rgbfb_driver = {
.driver = {
- .name = "rgbfb",
+ .name = "
pnx4008-
rgbfb",
},
.probe = rgbfb_probe,
.remove = rgbfb_remove,
},
.probe = rgbfb_probe,
.remove = rgbfb_remove,