From patchwork Wed Jul 30 00:54:07 2014 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: 374643 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4131314012D for ; Wed, 30 Jul 2014 10:54:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754324AbaG3AyX (ORCPT ); Tue, 29 Jul 2014 20:54:23 -0400 Received: from m12-18.163.com ([220.181.12.18]:44545 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754430AbaG3AyW (ORCPT ); Tue, 29 Jul 2014 20:54:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=yLuHNtPy2JEdspPFPh dLXtk6xjuo09bwuSrgAPumJJU=; b=P5BNCPQAm/ff9oLrn2b250DGxJB34zShcy y07zbi/wEwlONwmTtcpJMiXxbRNsxx4XED00BnFI6DxlpDw/74Ym6IYUcQ9oXr+D fO8R27em9hn4iGJvkfhN7Hj+TfUe3B5iKmJ4z12uj5k1Gv1UTnB51nlRecK8Umls ooRXLlcBA= Received: from localhost.localdomain.localdomain (unknown [180.110.163.205]) by smtp14 (Coremail) with SMTP id EsCowEA5CUIwQthTU3t3Cg--.417S2; Wed, 30 Jul 2014 08:54:08 +0800 (CST) X-Coremail-DSSMTP: 180.110.163.205 From: weiyj_lk@163.com To: Tejun Heo , Grant Likely , Rob Herring , Shawn Guo Cc: Wei Yongjun , linux-ide@vger.kernel.org Subject: [PATCH] ahci: imx: add missing clk_disable_unprepare() on error in imx_sata_enable() Date: Wed, 30 Jul 2014 08:54:07 +0800 Message-Id: <1406681647-24808-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 1.9.3 X-CM-TRANSID: EsCowEA5CUIwQthTU3t3Cg--.417S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kKw45Gr13tw4UCr13XFb_yoWDGrb_GF 17Wwn7Xw15uFnakw17G3WYvFya9r1kZrs5ZF4Iga43KF9rZw45CwsFvrn8Arnrtr40yF9I vwn8tr4fCr1fCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU5WxRPUUUUU== X-Originating-IP: [180.110.163.205] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiGRDY1lEANkRQfQAAsJ Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Wei Yongjun Add the missing clk_disable_unprepare() before return from imx_sata_enable() in the phy reset error handling case. Signed-off-by: Wei Yongjun Acked-by: Shawn Guo --- drivers/ata/ahci_imx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c index cac4360..7767325 100644 --- a/drivers/ata/ahci_imx.c +++ b/drivers/ata/ahci_imx.c @@ -265,7 +265,7 @@ static int imx_sata_enable(struct ahci_host_priv *hpriv) ret = imx_sata_phy_reset(hpriv); if (ret) { dev_err(dev, "failed to reset phy: %d\n", ret); - goto disable_regulator; + goto disable_clk; } } @@ -273,6 +273,8 @@ static int imx_sata_enable(struct ahci_host_priv *hpriv) return 0; +disable_clk: + clk_disable_unprepare(imxpriv->sata_ref_clk); disable_regulator: if (hpriv->target_pwr) regulator_disable(hpriv->target_pwr);