1 files changed, 52 insertions, 33 deletions

diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 7ebe50b335e..b3a498f22d3 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -482,6 +482,14 @@ static void dss_uninitialize_debugfs(void)
         if (dss_debugfs_dir)
                 debugfs_remove_recursive(dss_debugfs_dir);
 }
+#else /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
+static inline int dss_initialize_debugfs(void)
+{
+        return 0;
+}
+static inline void dss_uninitialize_debugfs(void)
+{
+}
 #endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
 
 /* PLATFORM DEVICE */
@@ -499,7 +507,7 @@ static int omap_dss_probe(struct platform_device *pdev)
 
         r = dss_get_clocks();
         if (r)
-                goto fail0;
+                goto err_clocks;
 
         dss_clk_enable_all_no_ctx();
 
@@ -515,64 +523,64 @@ static int omap_dss_probe(struct platform_device *pdev)
         r = dss_init(skip_init);
         if (r) {
                 DSSERR("Failed to initialize DSS\n");
-                goto fail0;
+                goto err_dss;
         }
 
-#ifdef CONFIG_OMAP2_DSS_RFBI
         r = rfbi_init();
         if (r) {
                 DSSERR("Failed to initialize rfbi\n");
-                goto fail0;
+                goto err_rfbi;
         }
-#endif
 
         r = dpi_init(pdev);
         if (r) {
                 DSSERR("Failed to initialize dpi\n");
-                goto fail0;
+                goto err_dpi;
         }
 
         r = dispc_init();
         if (r) {
                 DSSERR("Failed to initialize dispc\n");
-                goto fail0;
+                goto err_dispc;
         }
-#ifdef CONFIG_OMAP2_DSS_VENC
+
         r = venc_init(pdev);
         if (r) {
                 DSSERR("Failed to initialize venc\n");
-                goto fail0;
+                goto err_venc;
         }
-#endif
+
         if (cpu_is_omap34xx()) {
-#ifdef CONFIG_OMAP2_DSS_SDI
                 r = sdi_init(skip_init);
                 if (r) {
                         DSSERR("Failed to initialize SDI\n");
-                        goto fail0;
+                        goto err_sdi;
                 }
-#endif
-#ifdef CONFIG_OMAP2_DSS_DSI
+
                 r = dsi_init(pdev);
                 if (r) {
                         DSSERR("Failed to initialize DSI\n");
-                        goto fail0;
+                        goto err_dsi;
                 }
-#endif
         }
 
-#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
         r = dss_initialize_debugfs();
         if (r)
-                goto fail0;
-#endif
+                goto err_debugfs;
 
         for (i = 0; i < pdata->num_devices; ++i) {
                 struct omap_dss_device *dssdev = pdata->devices[i];
 
                 r = omap_dss_register_device(dssdev);
-                if (r)
-                        DSSERR("device reg failed %d\n", i);
+                if (r) {
+                        DSSERR("device %d %s register failed %d\n", i,
+                                dssdev->name ?: "unnamed", r);
+
+                        while (--i >= 0)
+                                omap_dss_unregister_device(pdata->devices[i]);
+
+                        goto err_register;
+                }
 
                 if (def_disp_name && strcmp(def_disp_name, dssdev->name) == 0)
                         pdata->default_device = dssdev;
@@ -582,8 +590,29 @@ static int omap_dss_probe(struct platform_device *pdev)
 
         return 0;
 
-        /* XXX fail correctly */
-fail0:
+err_register:
+        dss_uninitialize_debugfs();
+err_debugfs:
+        if (cpu_is_omap34xx())
+                dsi_exit();
+err_dsi:
+        if (cpu_is_omap34xx())
+                sdi_exit();
+err_sdi:
+        venc_exit();
+err_venc:
+        dispc_exit();
+err_dispc:
+        dpi_exit();
+err_dpi:
+        rfbi_exit();
+err_rfbi:
+        dss_exit();
+err_dss:
+        dss_clk_disable_all_no_ctx();
+        dss_put_clocks();
+err_clocks:
+
         return r;
 }
 
@@ -593,25 +622,15 @@ static int omap_dss_remove(struct platform_device *pdev)
         int i;
         int c;
 
-#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
         dss_uninitialize_debugfs();
-#endif
 
-#ifdef CONFIG_OMAP2_DSS_VENC
         venc_exit();
-#endif
         dispc_exit();
         dpi_exit();
-#ifdef CONFIG_OMAP2_DSS_RFBI
         rfbi_exit();
-#endif
         if (cpu_is_omap34xx()) {
-#ifdef CONFIG_OMAP2_DSS_DSI
                 dsi_exit();
-#endif
-#ifdef CONFIG_OMAP2_DSS_SDI
                 sdi_exit();
-#endif
         }
 
         dss_exit();