git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] eata: fix buffer overflow
[safe/jmp/linux-2.6]
/
drivers
/
video
/
q40fb.c
diff --git
a/drivers/video/q40fb.c
b/drivers/video/q40fb.c
index
8416b2e
..
4beac1d
100644
(file)
--- a/
drivers/video/q40fb.c
+++ b/
drivers/video/q40fb.c
@@
-14,7
+14,6
@@
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
@@
-84,12
+83,10
@@
static struct fb_ops q40fb_ops = {
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
- .fb_cursor = soft_cursor,
};
};
-static int __init q40fb_probe(struct
device *device
)
+static int __init q40fb_probe(struct
platform_device *dev
)
{
{
- struct platform_device *dev = to_platform_device(device);
struct fb_info *info;
if (!MACH_IS_Q40)
struct fb_info *info;
if (!MACH_IS_Q40)
@@
-98,7
+95,7
@@
static int __init q40fb_probe(struct device *device)
/* mapped in q40/config.c */
q40fb_fix.smem_start = Q40_PHYS_SCREEN_ADDR;
/* mapped in q40/config.c */
q40fb_fix.smem_start = Q40_PHYS_SCREEN_ADDR;
- info = framebuffer_alloc(sizeof(u32) *
25
6, &dev->dev);
+ info = framebuffer_alloc(sizeof(u32) *
1
6, &dev->dev);
if (!info)
return -ENOMEM;
if (!info)
return -ENOMEM;
@@
-129,10
+126,11
@@
static int __init q40fb_probe(struct device *device)
return 0;
}
return 0;
}
-static struct device_driver q40fb_driver = {
- .name = "q40fb",
- .bus = &platform_bus_type,
+static struct platform_driver q40fb_driver = {
.probe = q40fb_probe,
.probe = q40fb_probe,
+ .driver = {
+ .name = "q40fb",
+ },
};
static struct platform_device q40fb_device = {
};
static struct platform_device q40fb_device = {
@@
-146,12
+144,12
@@
int __init q40fb_init(void)
if (fb_get_options("q40fb", NULL))
return -ENODEV;
if (fb_get_options("q40fb", NULL))
return -ENODEV;
- ret = driver_register(&q40fb_driver);
+ ret =
platform_
driver_register(&q40fb_driver);
if (!ret) {
ret = platform_device_register(&q40fb_device);
if (ret)
if (!ret) {
ret = platform_device_register(&q40fb_device);
if (ret)
- driver_unregister(&q40fb_driver);
+
platform_
driver_unregister(&q40fb_driver);
}
return ret;
}
}
return ret;
}