lkml.org 
[lkml]   [2017]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC PATCH v4 2/8] drm/rockchip: analogix_dp: Fix error handling path
Date
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);
+ return ret;
}

static void rockchip_dp_unbind(struct device *dev, struct device *master,
--
2.11.0

\
 
 \ /
  Last update: 2017-10-17 12:18    [W:0.110 / U:1.232 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site