From patchwork Sat Mar 4 12:25:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9603913 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 A7E39602B4 for ; Sat, 4 Mar 2017 12:39:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 986582843F for ; Sat, 4 Mar 2017 12:39:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8ACCE2859E; Sat, 4 Mar 2017 12:39:05 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A16A2843F for ; Sat, 4 Mar 2017 12:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751929AbdCDMjD (ORCPT ); Sat, 4 Mar 2017 07:39:03 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34856 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910AbdCDMi5 (ORCPT ); Sat, 4 Mar 2017 07:38:57 -0500 Received: by mail-wr0-f195.google.com with SMTP id u108so12257783wrb.2 for ; Sat, 04 Mar 2017 04:38:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=tusTuPmXOJn/o04gCX7Jh1gsLuZ/tJSmIa4MAGpbvrA=; b=dCCv/RvIHuRWkL+wdaiBW9j0xqFVSlOTulppsYkHCPFGyUwbMELlom24HErm4MXO5E z4Bu46Q+TZZK3/iozzFv/oGsQ43mx2cO7Dg4L4DMZ4XbcT5pLnGr9V4Q1Acw/Q51CYTG MsqCBm27GVCTkK7Skr3mr4uBCsXSEWPEeSnGpLF07L1F7ImJiqePjtD6H8jPN4R/Cn2n 7wATPYW7wUph2iiiPp/9gWiyxSMqCDU9PuEDCkichaD9dlX0vgE4iHz4jIAaMO3rHbjt rqyAXt8tM8YaNnOArCbSuFL0UvydjyuqtI0iQS6VO7iC7o8bB2vc0XcNm0DRUtn7Qu0V Yhiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=tusTuPmXOJn/o04gCX7Jh1gsLuZ/tJSmIa4MAGpbvrA=; b=FUXLWyxyHHtBWl8ikOSaS65r8EU7y0bHmfql9Q28hlcf2xTVO98h29I/tu5CaCKSUA UMCttMsc4Me/f/0v66OmRcOvXnCQn+CywlxOoWo2PQ1tP5x/2/bpBJcvKUUwiaWD/bJe 8L64L0imq7aKwvWJY9mxsWhS7jP5myVhKKoy4K+ARc8bKcNaSgzjzJSd6QIrOq25X8E0 75fdmxrolIWzn6SCtbXeIdP2CsqaX2wRGo4O1SLM/G4tNU27qsQTsVq12F9K8K26eWND iTR3Rmy0uvh86kbf5aYh13ORMDT1XZrW1v7nyKzuOIQu360P/bO3hY+scdvU3JVLAJmE vepg== X-Gm-Message-State: AMke39kaAgT+zdc7K3j10t3IQCuzuRjdLEpZ50end4VpJeZzM2a344cWWeYe2+M377sx6Q== X-Received: by 10.223.170.210 with SMTP id i18mr7431406wrc.114.1488631100257; Sat, 04 Mar 2017 04:38:20 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:98cd:c51c:6f4e:443? (p200300C6EBDC400098CDC51C6F4E0443.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:98cd:c51c:6f4e:443]) by smtp.googlemail.com with ESMTPSA id q4sm19093881wrc.35.2017.03.04.04.38.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 04:38:19 -0800 (PST) Subject: [PATCH v5 6/10] mmc: meson-gx: fix error path in meson_mmc_clk_init / meson_mmc_probe To: Ulf Hansson , Kevin Hilman References: Cc: "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org From: Heiner Kallweit Message-ID: <5291f703-af62-b9a5-3f5e-f0f8a2d6248e@gmail.com> Date: Sat, 4 Mar 2017 13:25:14 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The condition should be "if (ret)" as the disable/unprepare is supposed to be executed if the previous command fails. In addition adjust the error path in probe to properly deal with the case that cfg_div_clk can be registered successfully but enable/prepare fails. In this case we shouldn't call clk_disable_unprepare. Reported-by: Michał Zegan Signed-off-by: Heiner Kallweit Acked-by: Kevin Hilman --- v2: - extended commit message v3: - adjust error path in probe v4: - added acked-by v5: - no changes --- drivers/mmc/host/meson-gx-mmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 68e76fa8..002e4aac 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -321,7 +321,7 @@ static int meson_mmc_clk_init(struct meson_host *host) host->mmc->f_min = clk_round_rate(host->cfg_div_clk, 400000); ret = meson_mmc_clk_set(host, host->mmc->f_min); - if (!ret) + if (ret) clk_disable_unprepare(host->cfg_div_clk); return ret; @@ -771,7 +771,7 @@ static int meson_mmc_probe(struct platform_device *pdev) meson_mmc_irq_thread, IRQF_SHARED, DRIVER_NAME, host); if (ret) - goto free_host; + goto err_div_clk; mmc->max_blk_count = CMD_CFG_LENGTH_MASK; mmc->max_req_size = mmc->max_blk_count * mmc->max_blk_size; @@ -784,7 +784,7 @@ static int meson_mmc_probe(struct platform_device *pdev) if (host->bounce_buf == NULL) { dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); ret = -ENOMEM; - goto free_host; + goto err_div_clk; } mmc->ops = &meson_mmc_ops; @@ -792,8 +792,9 @@ static int meson_mmc_probe(struct platform_device *pdev) return 0; -free_host: +err_div_clk: clk_disable_unprepare(host->cfg_div_clk); +free_host: clk_disable_unprepare(host->core_clk); mmc_free_host(mmc); return ret;