Commit 8d972a96 authored by Russell King's avatar Russell King Committed by Russell King

[DRIVER MODEL] Fix arcfb

Release code in driver modules is a potential cause of oopsen.
The device may be in use by a userspace process, which will keep
a reference to the device.  If the module is unloaded, the module
text will be freed.  Subsequently, when the last reference is
dropped, the release code will be called, which no longer exists.

Use generic platform device allocation/release code in modules.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 09c6518c
...@@ -502,10 +502,6 @@ static ssize_t arcfb_write(struct file *file, const char *buf, size_t count, ...@@ -502,10 +502,6 @@ static ssize_t arcfb_write(struct file *file, const char *buf, size_t count,
return err; return err;
} }
static void arcfb_platform_release(struct device *device)
{
}
static struct fb_ops arcfb_ops = { static struct fb_ops arcfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_open = arcfb_open, .fb_open = arcfb_open,
...@@ -624,13 +620,7 @@ static struct device_driver arcfb_driver = { ...@@ -624,13 +620,7 @@ static struct device_driver arcfb_driver = {
.remove = arcfb_remove, .remove = arcfb_remove,
}; };
static struct platform_device arcfb_device = { static struct platform_device *arcfb_device;
.name = "arcfb",
.id = 0,
.dev = {
.release = arcfb_platform_release,
}
};
static int __init arcfb_init(void) static int __init arcfb_init(void)
{ {
...@@ -641,9 +631,16 @@ static int __init arcfb_init(void) ...@@ -641,9 +631,16 @@ static int __init arcfb_init(void)
ret = driver_register(&arcfb_driver); ret = driver_register(&arcfb_driver);
if (!ret) { if (!ret) {
ret = platform_device_register(&arcfb_device); arcfb_device = platform_device_alloc("arcfb", 0);
if (ret) if (arcfb_device) {
ret = platform_device_add(arcfb_device);
} else {
ret = -ENOMEM;
}
if (ret) {
platform_device_put(arcfb_device);
driver_unregister(&arcfb_driver); driver_unregister(&arcfb_driver);
}
} }
return ret; return ret;
...@@ -651,7 +648,7 @@ static int __init arcfb_init(void) ...@@ -651,7 +648,7 @@ static int __init arcfb_init(void)
static void __exit arcfb_exit(void) static void __exit arcfb_exit(void)
{ {
platform_device_unregister(&arcfb_device); platform_device_unregister(arcfb_device);
driver_unregister(&arcfb_driver); driver_unregister(&arcfb_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment