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
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
video
/
chipsfb.c
diff --git
a/drivers/video/chipsfb.c
b/drivers/video/chipsfb.c
index
114afca
..
4ee5a25
100644
(file)
--- a/
drivers/video/chipsfb.c
+++ b/
drivers/video/chipsfb.c
@@
-362,7
+362,7
@@
static void __init init_chips(struct fb_info *p, unsigned long addr)
p->var = chipsfb_var;
p->fbops = &chipsfb_ops;
p->var = chipsfb_var;
p->fbops = &chipsfb_ops;
- p->flags = FBINFO_
FLAG_
DEFAULT;
+ p->flags = FBINFO_DEFAULT;
fb_alloc_cmap(&p->cmap, 256, 0);
fb_alloc_cmap(&p->cmap, 256, 0);
@@
-462,9
+462,14
@@
static struct pci_driver chipsfb_driver = {
int __init chips_init(void)
{
int __init chips_init(void)
{
+ if (fb_get_options("chipsfb", NULL))
+ return -ENODEV;
+
return pci_module_init(&chipsfb_driver);
}
return pci_module_init(&chipsfb_driver);
}
+module_init(chips_init);
+
static void __exit chipsfb_exit(void)
{
pci_unregister_driver(&chipsfb_driver);
static void __exit chipsfb_exit(void)
{
pci_unregister_driver(&chipsfb_driver);
@@
-493,7
+498,7
@@
chips_sleep_notify(struct pmu_sleep_notifier *self, int when)
case PBOOK_SLEEP_REJECT:
if (save_framebuffer) {
vfree(save_framebuffer);
case PBOOK_SLEEP_REJECT:
if (save_framebuffer) {
vfree(save_framebuffer);
- save_framebuffer =
0
;
+ save_framebuffer =
NULL
;
}
break;
case PBOOK_SLEEP_NOW:
}
break;
case PBOOK_SLEEP_NOW:
@@
-505,7
+510,7
@@
chips_sleep_notify(struct pmu_sleep_notifier *self, int when)
if (save_framebuffer) {
memcpy(p->screen_base, save_framebuffer, nb);
vfree(save_framebuffer);
if (save_framebuffer) {
memcpy(p->screen_base, save_framebuffer, nb);
vfree(save_framebuffer);
- save_framebuffer =
0
;
+ save_framebuffer =
NULL
;
}
chipsfb_blank(0, p);
break;
}
chipsfb_blank(0, p);
break;