1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index b20b69488dc9..6be623b4a86f 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -120,8 +120,8 @@ static int cpufreq_transition(struct notifier_block *nb,
 static int tilcdc_unload(struct drm_device *dev)
 {
         struct tilcdc_drm_private *priv = dev->dev_private;
-        struct tilcdc_module *mod, *cur;
 
+        drm_fbdev_cma_fini(priv->fbdev);
         drm_kms_helper_poll_fini(dev);
         drm_mode_config_cleanup(dev);
         drm_vblank_cleanup(dev);
@@ -148,11 +148,6 @@ static int tilcdc_unload(struct drm_device *dev)
 
         pm_runtime_disable(dev->dev);
 
-        list_for_each_entry_safe(mod, cur, &module_list, list) {
-                DBG("destroying module: %s", mod->name);
-                mod->funcs->destroy(mod);
-        }
-
         kfree(priv);
 
         return 0;
@@ -628,13 +623,13 @@ static int __init tilcdc_drm_init(void)
 static void __exit tilcdc_drm_fini(void)
 {
         DBG("fini");
-        tilcdc_tfp410_fini();
-        tilcdc_slave_fini();
-        tilcdc_panel_fini();
         platform_driver_unregister(&tilcdc_platform_driver);
+        tilcdc_panel_fini();
+        tilcdc_slave_fini();
+        tilcdc_tfp410_fini();
 }
 
-late_initcall(tilcdc_drm_init);
+module_init(tilcdc_drm_init);
 module_exit(tilcdc_drm_fini);
 
 MODULE_AUTHOR("Rob Clark <robdclark@gmail.com");