From patchwork Tue Jul 19 11:32:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiyj_lk@163.com X-Patchwork-Id: 9236803 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2DEA6075D for ; Tue, 19 Jul 2016 11:34:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A09F8205A4 for ; Tue, 19 Jul 2016 11:34:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91D62205AF; Tue, 19 Jul 2016 11:34:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23C3D205A4 for ; Tue, 19 Jul 2016 11:34:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bPTHp-0002ym-MM; Tue, 19 Jul 2016 11:34:05 +0000 Received: from m12-11.163.com ([220.181.12.11]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bPTHd-0002nT-JJ; Tue, 19 Jul 2016 11:33:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=46rO4 fgoy+cqSDJYUy0HBP5fN0BncfQS19exzEC7tGo=; b=SHqSoWstOY4clRo9iGXXv txnl61NM4lxnRC96fxQOMYKBl6BF7opNgxonP8dn2rJF+HSrlwCnd9PVFtvu0cFt KqXq4JbQFic1X98bUJuJpKji8qB2Ibzapo1YK0upabELBJoh7uFWofslNsdUOH4o XkbNSQPIk0Jsoo6XUMARPs= Received: from localhost.localdomain.localdomain (unknown [180.110.255.208]) by smtp7 (Coremail) with SMTP id C8CowACXm93bD45XwauJAQ--.49284S2; Tue, 19 Jul 2016 19:32:45 +0800 (CST) From: Wei Yongjun To: Mark Yao , David Airlie , Heiko Stuebner Subject: [PATCH -next] drm/rockchip: analogix_dp: add missing clk_disable_unprepare() on error Date: Tue, 19 Jul 2016 11:32:43 +0000 Message-Id: <1468927963-2947-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CM-TRANSID: C8CowACXm93bD45XwauJAQ--.49284S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kKw13AFW3JF4DAFyUGFg_yoWDKFgE9w 17Xr43WF109FZ5A347Wa43G39IvwnI9F4rGF10yF4fJFnrtw45Ja4Fv3yY9ayDKr4xAFsx C3WYqr10kF1fGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU01xRDUUUUU== X-Originating-IP: [180.110.255.208] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/xtbBDR2r1laDoIJR6gAAsh X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160719_043353_966302_6FB8E7A6 X-CRM114-Status: UNSURE ( 6.80 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, Wei Yongjun , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Add the missing clk_disable_unprepare() before return in the error handling case. Signed-off-by: Wei Yongjun --- 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; }