From patchwork Fri Mar 3 19:56:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9603427 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 48BD660414 for ; Fri, 3 Mar 2017 20:00:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B84E28631 for ; Fri, 3 Mar 2017 20:00:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 305FF28633; Fri, 3 Mar 2017 20:00:49 +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 7FFA528631 for ; Fri, 3 Mar 2017 20:00:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751842AbdCCUAs (ORCPT ); Fri, 3 Mar 2017 15:00:48 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:32924 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751820AbdCCUAr (ORCPT ); Fri, 3 Mar 2017 15:00:47 -0500 Received: by mail-wm0-f66.google.com with SMTP id n11so4726581wma.0 for ; Fri, 03 Mar 2017 12:00:46 -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=4soN0WWqazMqoyrjos44FYFYFG1cvZ25zJai8R7Y2eo=; b=jVoLpCMiEcQjMm8c8pmcPW5sN5moUug4mSHLSKPQKiXCKYsyIujGhZrOlmivh5W77F zm+91MwNEZogZ0afWEeaRUC6XdNAQe8viENCG/w8edPWptHnjQTowZ96F+6LykeF/AD6 ETQtdPE7uVbaRruk0L3yJJpFKreNqxiWHKP7L5FmlQouOOb6i//5NGkoy7dV8UUFRclp baGHg2+rnScmZL1Iz8IXwVuXOFp0a8f0CRtso50yvcKjktQKjxx3zG+jnPZ7CZrd89gn CPG0A2HYT658iqpufC9fFgTKMGvxB6jMCxaPpRFXcSKQ/+5SIyEHnpatWmcMAGZtK89m pNhA== 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=4soN0WWqazMqoyrjos44FYFYFG1cvZ25zJai8R7Y2eo=; b=F72hiML7PsyFEcaJXIS+Hkkb/4yecvIaNBZjWJ3jcE3JwktNH5N6JwaYLTLNFHDoab uiTE/oN6kzBf5UOJ8k736WYbu4boO2UwY58O8WVnmrXwVM41DiDk6gSrO9QBI4mq/ahz pjE/xAmtEXN+FAMjqGnlwh3FVXOrNY7JR+eKUOYXI1NjpC/Yeu3SHHblT4QNyV6x8A0w HPwcd7VV/rSQd4n057JkE3N01SgYcpsoRpBwnkVrPvrCjh3aiALqEcs5QLAI4WYsDpGF 9Kldu27S3WKDb9eQryY6U4i6LvGzWqs1VGRuKEeYKSfoU31WtCjahYiZA4iLYmRd6sbQ C7xQ== X-Gm-Message-State: AMke39mf1WKNg891sT1jBdlgU5dOiW9xV+V4FVEFxaByavRF8ZGdB/ocf+w3AmMKh92OHw== X-Received: by 10.28.143.204 with SMTP id r195mr4202952wmd.32.1488571245853; Fri, 03 Mar 2017 12:00:45 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:f903:fe11:afad:80a0? (p200300C6EBDC4000F903FE11AFAD80A0.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:f903:fe11:afad:80a0]) by smtp.googlemail.com with ESMTPSA id h75sm16366179wrh.37.2017.03.03.12.00.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 12:00:45 -0800 (PST) Subject: [PATCH v4 6/10] mmc: meson-gx: fix error path in meson_mmc_clk_init / meson_mmc_probe To: Ulf Hansson , Kevin Hilman References: <62912f3d-2307-cfff-3c69-c8b8ffaeb474@gmail.com> Cc: "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org From: Heiner Kallweit Message-ID: <52120418-6365-51af-252e-8ad969969acd@gmail.com> Date: Fri, 3 Mar 2017 20:56:33 +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: <62912f3d-2307-cfff-3c69-c8b8ffaeb474@gmail.com> 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 --- 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;