]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[DRIVER MODEL] Fix gbefb
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 5 Nov 2005 21:22:13 +0000 (21:22 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 5 Nov 2005 21:22:13 +0000 (21:22 +0000)
Statically allocated devices in module data 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 data will be freed.  Subsequent use of the platform
device will cause a kernel oops.

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/gbefb.c

index 316bfe994811f54deadf88da8371b4da2bfbce8d..ed853bef19e9d85ccf4532f8251d00321b28c814 100644 (file)
@@ -1260,24 +1260,30 @@ static struct device_driver gbefb_driver = {
        .remove = __devexit_p(gbefb_remove),
 };
 
-static struct platform_device gbefb_device = {
-       .name = "gbefb",
-};
+static struct platform_device *gbefb_device;
 
 int __init gbefb_init(void)
 {
        int ret = driver_register(&gbefb_driver);
        if (!ret) {
-               ret = platform_device_register(&gbefb_device);
-               if (ret)
+               gbefb_device = platform_device_alloc("gbefb", 0);
+               if (gbefb_device) {
+                       ret = platform_device_add(gbefb_device);
+               } else {
+                       ret = -ENOMEM;
+               }
+               if (ret) {
+                       platform_device_put(gbefb_device);
                        driver_unregister(&gbefb_driver);
+               }
        }
        return ret;
 }
 
 void __exit gbefb_exit(void)
 {
-        driver_unregister(&gbefb_driver);
+       platform_device_unregister(gbefb_device);
+       driver_unregister(&gbefb_driver);
 }
 
 module_init(gbefb_init);