From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752023AbdBTBkg (ORCPT ); Sun, 19 Feb 2017 20:40:36 -0500 Received: from regular1.263xmail.com ([211.150.99.139]:43338 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751042AbdBTBkf (ORCPT ); Sun, 19 Feb 2017 20:40:35 -0500 X-263anti-spam: KSV:0;BIG:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ADDR-CHECKED4: 1 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: kernel-janitors@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <7ec1c10d4a1b1785ff4f46f06cd15c34> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH] drm/rockchip: cdn-dp: Fix error handling To: Christophe JAILLET , airlied@linux.ie, heiko@sntech.de References: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org From: Mark yao Message-ID: <58AA4908.2000808@rock-chips.com> Date: Mon, 20 Feb 2017 09:40:24 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20170219165942.17268-1-christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017年02月20日 00:59, Christophe JAILLET wrote: > It is likely that both 'clk_disable_unprepare()' should be called if > 'pm_runtime_get_sync()' fails. > > Add a new label for that, because 'err_set_rate' is not meaningful in this > case. > > > Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for rk3399") > > Signed-off-by: Christophe JAILLET > --- > Not sure but a 'pm_runtime_get_sync()' is maybe also required in the > 'err_set_rate' path. > --- > drivers/gpu/drm/rockchip/cdn-dp-core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c > index 9ab67a670885..0fe1ec8b8fb1 100644 > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c > @@ -111,7 +111,7 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp) > ret = pm_runtime_get_sync(dp->dev); > if (ret < 0) { > DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret); > - goto err_pclk; > + goto err_sync; I think the name err_pm_runtime_get is better. err_sync is not a clear name for the pm_runtime_get_sync. > } > > reset_control_assert(dp->core_rst); > @@ -133,6 +133,7 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp) > return 0; > > err_set_rate: > +err_sync: miss pm_runtime_put, it should be: err_set_rate: pm_runtime_put(dp->dev); err_pm_runtime_get: clk_disable_unprepare(dp->core_clk); err_core_clk: > clk_disable_unprepare(dp->core_clk); > err_core_clk: > clk_disable_unprepare(dp->pclk); -- Mark Yao