Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/video/grvga.c b/drivers/video/grvga.c
index c078701..861109e 100644
--- a/drivers/video/grvga.c
+++ b/drivers/video/grvga.c
@@ -496,6 +496,7 @@ static int grvga_probe(struct platform_device *dev)
 	return 0;
 
 free_mem:
+	dev_set_drvdata(&dev->dev, NULL);
 	if (grvga_fix_addr)
 		iounmap((void *)virtual_start);
 	else
@@ -529,6 +530,7 @@ static int grvga_remove(struct platform_device *device)
 			kfree((void *)info->screen_base);
 
 		framebuffer_release(info);
+		dev_set_drvdata(&device->dev, NULL);
 	}
 
 	return 0;
@@ -555,7 +557,19 @@ static struct platform_driver grvga_driver = {
 	.remove		= grvga_remove,
 };
 
-module_platform_driver(grvga_driver);
+
+static int __init grvga_init(void)
+{
+	return platform_driver_register(&grvga_driver);
+}
+
+static void __exit grvga_exit(void)
+{
+	platform_driver_unregister(&grvga_driver);
+}
+
+module_init(grvga_init);
+module_exit(grvga_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Aeroflex Gaisler");