linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] drm/rockchip: analogix_dp: add missing clk_disable_unprepare() on error
@ 2016-07-19 11:32 Wei Yongjun
  2016-07-19 20:38 ` Sean Paul
  0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2016-07-19 11:32 UTC (permalink / raw)
  To: linux-arm-kernel

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Add the missing clk_disable_unprepare() before return in the
error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index e81e19a..89aadbf 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -96,6 +96,7 @@ static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data)
 	ret = rockchip_dp_pre_init(dp);
 	if (ret < 0) {
 		dev_err(dp->dev, "failed to dp pre init %d\n", ret);
+		clk_disable_unprepare(dp->pclk);
 		return ret;
 	}
 
@@ -272,6 +273,7 @@ static int rockchip_dp_init(struct rockchip_dp_device *dp)
 	ret = rockchip_dp_pre_init(dp);
 	if (ret < 0) {
 		dev_err(dp->dev, "failed to pre init %d\n", ret);
+		clk_disable_unprepare(dp->pclk);
 		return ret;
 	}

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH -next] drm/rockchip: analogix_dp: add missing clk_disable_unprepare() on error
  2016-07-19 11:32 [PATCH -next] drm/rockchip: analogix_dp: add missing clk_disable_unprepare() on error Wei Yongjun
@ 2016-07-19 20:38 ` Sean Paul
  0 siblings, 0 replies; 2+ messages in thread
From: Sean Paul @ 2016-07-19 20:38 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 19, 2016 at 7:32 AM, Wei Yongjun <weiyj_lk@163.com> wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Add the missing clk_disable_unprepare() before return in the
> error handling case.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>


Applied to drm-misc



> ---
>  drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> index e81e19a..89aadbf 100644
> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> @@ -96,6 +96,7 @@ static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data)
>         ret = rockchip_dp_pre_init(dp);
>         if (ret < 0) {
>                 dev_err(dp->dev, "failed to dp pre init %d\n", ret);
> +               clk_disable_unprepare(dp->pclk);
>                 return ret;
>         }
>
> @@ -272,6 +273,7 @@ static int rockchip_dp_init(struct rockchip_dp_device *dp)
>         ret = rockchip_dp_pre_init(dp);
>         if (ret < 0) {
>                 dev_err(dp->dev, "failed to pre init %d\n", ret);
> +               clk_disable_unprepare(dp->pclk);
>                 return ret;
>         }
>
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-07-19 20:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-19 11:32 [PATCH -next] drm/rockchip: analogix_dp: add missing clk_disable_unprepare() on error Wei Yongjun
2016-07-19 20:38 ` Sean Paul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).