drm/omap: dsi: Fix missing of_platform_depopulate()

We're missing a call to of_platform_depopulate() on errors for dsi. Looks like dss is already doing this.

Signed-off-by Tony Lindgren <[email protected]>

---
 drivers/gpu/drm/omapdrm/dss/dsi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(quoted diff) +0 -0

b/drivers/gpu/drm/omapdrm/dss/dsi.c --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c

drivers/gpu/drm/omapdrm/dss/dsi.c +6 -2

@@ -5429,15 +5429,19 @@ static int dsi_probe(struct platform_device *pdev)
 	}
 
 	r = of_platform_populate(dev->of_node, NULL, NULL, dev);
-	if (r)
+	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_uninit_output;
+		goto err_of_depopulate;
 
 	return 0;
 
+err_of_depopulate:
+	of_platform_depopulate(dev);
 err_uninit_output:
 	dsi_uninit_output(dsi);
 err_pm_disable:

Hi Tony,

Thank you for the patch.

On Tuesday, 6 November 2018 17:28:02 EET Tony Lindgren wrote:

Quoted 4 lines

We're missing a call to of_platform_depopulate() on errors for dsi. Looks like dss is already doing this.

Signed-off-by Tony Lindgren <[email protected]>

This makes sense to me. You may however want to note in the commit message that this patch also turns the of_platform_populate() failures into fatal errors.

Quoted 4 lines · Laurent Pinchart

Quoted 3 lines · On Tuesday, 6 November 2018 17:28:02 EET Tony Lindgren wrote:

We're missing a call to of_platform_depopulate() on errors for dsi. Looks like dss is already doing this.

Quoted 5 lines

Quoted 1 line

Signed-off-by Tony Lindgren <[email protected]>

This makes sense to me. You may however want to note in the commit message that this patch also turns the of_platform_populate() failures into fatal errors.

Well of_platform_populate() failure should be fatal here,right? :)

Tomi, let me know if you need a resend with updated comments or if you want to update the message yourself to your liking.

We're missing a call to of_platform_depopulate() on errors for dsi. Looks like dss is already doing this.

Signed-off-by Tony Lindgren <[email protected]>

---

 drivers/gpu/drm/omapdrm/dss/dsi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/gpu/drm/omapdrm/dss/dsi.c +6 -2

@@ -5429,15 +5429,19 @@ static int dsi_probe(struct platform_device *pdev)
 	}
 
 	r = of_platform_populate(dev->of_node, NULL, NULL, dev);
-	if (r)
+	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_uninit_output;
+		goto err_of_depopulate;
 
 	return 0;
 
+err_of_depopulate:
+	of_platform_depopulate(dev);
 err_uninit_output:
 	dsi_uninit_output(dsi);
 err_pm_disable:

Signature · 1 line

2.19.1

We're missing a call to of_platform_depopulate() on errors for dsi. Looks like dss is already doing this.

Signed-off-by Tony Lindgren <[email protected]>

---
 drivers/gpu/drm/omapdrm/dss/dsi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

drivers/gpu/drm/omapdrm/dss/dsi.c +3 -1

@@ -5429,15 +5429,19 @@ static int dsi_probe(struct platform_device *pdev)
 	}
 
 	r = of_platform_populate(dev->of_node, NULL, NULL, dev);
-	if (r)
+	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)