1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 0a485c5b982e..00a9c2ab9e6c 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5418,9 +5418,15 @@ static int dsi_probe(struct platform_device *pdev)
                 dsi->num_lanes_supported = 3;
         }
 
+        r = of_platform_populate(dev->of_node, NULL, NULL, dev);
+        if (r) {
+                DSSERR("Failed to populate DSI child devices: %d\n", r);
+                goto err_pm_disable;
+        }
+
         r = dsi_init_output(dsi);
         if (r)
-                goto err_pm_disable;
+                goto err_of_depopulate;
 
         r = dsi_probe_of(dsi);
         if (r) {
@@ -5428,22 +5434,16 @@ static int dsi_probe(struct platform_device *pdev)
                 goto err_uninit_output;
         }
 
-        r = of_platform_populate(dev->of_node, NULL, NULL, dev);
-        if (r) {
-                DSSERR("Failed to populate DSI child devices: %d\n", r);
-                goto err_uninit_output;
-        }
-
         r = component_add(&pdev->dev, &dsi_component_ops);
         if (r)
-                goto err_of_depopulate;
+                goto err_uninit_output;
 
         return 0;
 
-err_of_depopulate:
-        of_platform_depopulate(dev);
 err_uninit_output:
         dsi_uninit_output(dsi);
+err_of_depopulate:
+        of_platform_depopulate(dev);
 err_pm_disable:
         pm_runtime_disable(dev);
         return r;