diff options
author | Tony Lindgren <tony@atomide.com> | 2018-11-06 10:28:02 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-11-12 04:50:13 -0500 |
commit | cbed7545db7ae5907d7dc9d4002717d46cae29e9 (patch) | |
tree | 7554efc6c23be3c55614edbcae02a12963211b4e /drivers/gpu/drm/omapdrm | |
parent | 24ec84e854c68ceda59a26027114eb7f260f9411 (diff) |
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 <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
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dsi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 36123c086d97..0a485c5b982e 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c | |||
@@ -5429,15 +5429,19 @@ static int dsi_probe(struct platform_device *pdev) | |||
5429 | } | 5429 | } |
5430 | 5430 | ||
5431 | r = of_platform_populate(dev->of_node, NULL, NULL, dev); | 5431 | r = of_platform_populate(dev->of_node, NULL, NULL, dev); |
5432 | if (r) | 5432 | if (r) { |
5433 | DSSERR("Failed to populate DSI child devices: %d\n", r); | 5433 | DSSERR("Failed to populate DSI child devices: %d\n", r); |
5434 | goto err_uninit_output; | ||
5435 | } | ||
5434 | 5436 | ||
5435 | r = component_add(&pdev->dev, &dsi_component_ops); | 5437 | r = component_add(&pdev->dev, &dsi_component_ops); |
5436 | if (r) | 5438 | if (r) |
5437 | goto err_uninit_output; | 5439 | goto err_of_depopulate; |
5438 | 5440 | ||
5439 | return 0; | 5441 | return 0; |
5440 | 5442 | ||
5443 | err_of_depopulate: | ||
5444 | of_platform_depopulate(dev); | ||
5441 | err_uninit_output: | 5445 | err_uninit_output: |
5442 | dsi_uninit_output(dsi); | 5446 | dsi_uninit_output(dsi); |
5443 | err_pm_disable: | 5447 | err_pm_disable: |