]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[DRIVER MODEL] Fix arcfb
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 5 Nov 2005 21:21:38 +0000 (21:21 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 5 Nov 2005 21:21:38 +0000 (21:21 +0000)
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: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/video/arcfb.c

index 126daff1c848fafba595223580ffbd847322118a..6aa9f824c185ce62749e276c0e05eb80755e786a 100644 (file)
@@ -502,10 +502,6 @@ static ssize_t arcfb_write(struct file *file, const char *buf, size_t count,
        return err;
 }
 
-static void arcfb_platform_release(struct device *device)
-{
-}
-
 static struct fb_ops arcfb_ops = {
        .owner          = THIS_MODULE,
        .fb_open        = arcfb_open,
@@ -624,13 +620,7 @@ static struct device_driver arcfb_driver = {
        .remove = arcfb_remove,
 };
 
-static struct platform_device arcfb_device = {
-       .name   = "arcfb",
-       .id     = 0,
-       .dev    = {
-               .release = arcfb_platform_release,
-       }
-};
+static struct platform_device *arcfb_device;
 
 static int __init arcfb_init(void)
 {
@@ -641,9 +631,16 @@ static int __init arcfb_init(void)
 
        ret = driver_register(&arcfb_driver);
        if (!ret) {
-               ret = platform_device_register(&arcfb_device);
-               if (ret)
+               arcfb_device = platform_device_alloc("arcfb", 0);
+               if (arcfb_device) {
+                       ret = platform_device_add(arcfb_device);
+               } else {
+                       ret = -ENOMEM;
+               }
+               if (ret) {
+                       platform_device_put(arcfb_device);
                        driver_unregister(&arcfb_driver);
+               }
        }
        return ret;
 
@@ -651,7 +648,7 @@ static int __init arcfb_init(void)
 
 static void __exit arcfb_exit(void)
 {
-       platform_device_unregister(&arcfb_device);
+       platform_device_unregister(arcfb_device);
        driver_unregister(&arcfb_driver);
 }