Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0940c527 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: dsi: Fix OF platform depopulate 



Commit edb715df ("drm/omap: dss: dsi: Move initialization code from
bind to probe") moved the of_platform_populate() call from dsi_bind() to
dsi_probe(), but failed to move the corresponding
of_platform_depopulate() from dsi_unbind() to dsi_remove(). This results
in OF child devices being potentially removed multiple times. Fix it by
placing the of_platform_depopulate() call where it belongs.

Fixes: edb715df ("drm/omap: dss: dsi: Move initialization code from bind to probe")
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190111035120.20668-4-laurent.pinchart@ideasonboard.com
parent 4df04ac9

drivers/gpu/drm/omapdrm/dss/dsi.c

+2 −2
Original line number Diff line number Diff line
@@ -5104,8 +5104,6 @@ static void dsi_unbind(struct device *dev, struct device *master, void *data) 
	dss_debugfs_remove_file(dsi->debugfs.irqs);

	dss_debugfs_remove_file(dsi->debugfs.regs);



	of_platform_depopulate(dev);



	WARN_ON(dsi->scp_clk_refcount > 0);



	dss_pll_unregister(&dsi->pll);
@@ -5457,6 +5455,8 @@ static int dsi_remove(struct platform_device *pdev) 


	dsi_uninit_output(dsi);



	of_platform_depopulate(&pdev->dev);



	pm_runtime_disable(&pdev->dev);



	if (dsi->vdds_dsi_reg != NULL && dsi->vdds_dsi_enabled) {