On Tue, Oct 17, 2017 at 06:16:18PM +0800, Jeffy Chen wrote:
Add missing error handling in rockchip_dp_bind().
Fixes: 9e32e16e9e98 ("drm: rockchip: dp: add rockchip platform dp driver") Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com
Changes in v4: None Changes in v3: None Changes in v2: None
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 4d3f6ad0abdd..4b689c0f3fc1 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -371,7 +371,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, ret = rockchip_dp_drm_create_encoder(dp); if (ret) { DRM_ERROR("failed to create drm encoder\n");
return ret;
goto err_disable_pclk;}
dp->plat_data.encoder = &dp->encoder;
@@ -387,7 +387,17 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set);
- return analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
- ret = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
- if (ret < 0)
goto err_unreg_psr;- return 0;
+err_unreg_psr:
- rockchip_drm_psr_unregister(&dp->encoder);
- rockchip_dp_drm_encoder_destroy(&dp->encoder);
+err_disable_pclk:
- clk_disable_unprepare(dp->pclk);
Hi Jeffy, This part of the cleanup is handling things setup by rockchip_dp_init(). However if someone adds something to rockchip_dp_init(), it's not obvious that it should be cleaned up here and in unbind(). I'd suggest rebasing this on a new patch which folds everything rockchip_dp_init() does into rockchip_dp_bind(), then it will be obvious what needs to be cleaned up.
Sean
- return ret;
}
static void rockchip_dp_unbind(struct device *dev, struct device *master,
2.11.0