Skip to content

Commit

Permalink
drm/omap: dsi: Fix missing of_platform_depopulate()
Browse files Browse the repository at this point in the history
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 <tony@atomide.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181106152802.38599-1-tony@atomide.com
  • Loading branch information
Tony Lindgren authored and Tomi Valkeinen committed Nov 12, 2018
1 parent 24ec84e commit cbed754
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/gpu/drm/omapdrm/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit cbed754

Please sign in to comment.