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

Commit e45df264 authored by Jeffy Chen's avatar Jeffy Chen Committed by Heiko Stuebner
Browse files

drm/rockchip: dw-mipi-dsi: Fix connector and encoder cleanup. 



In bind()'s error handling path call destroy functions instead of
cleanup functions for encoder and connector and reorder to match how is
called in bind().

In unbind() call the connector and encoder destroy functions.

Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180302175757.28192-2-enric.balletbo@collabora.com
parent 9aecbc45

drivers/gpu/drm/rockchip/dw-mipi-dsi.c

+6 −2
Original line number Diff line number Diff line
@@ -1302,8 +1302,8 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, 
err_mipi_dsi_host:

	mipi_dsi_host_unregister(&dsi->dsi_host);

err_cleanup:

	drm_encoder_cleanup(&dsi->encoder);

	drm_connector_cleanup(&dsi->connector);

	dsi->connector.funcs->destroy(&dsi->connector);

	dsi->encoder.funcs->destroy(&dsi->encoder);

err_pllref:

	clk_disable_unprepare(dsi->pllref_clk);

	return ret;
@@ -1316,6 +1316,10 @@ static void dw_mipi_dsi_unbind(struct device *dev, struct device *master, 


	mipi_dsi_host_unregister(&dsi->dsi_host);

	pm_runtime_disable(dev);



	dsi->connector.funcs->destroy(&dsi->connector);

	dsi->encoder.funcs->destroy(&dsi->encoder);



	clk_disable_unprepare(dsi->pllref_clk);

}