From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751690AbdB1EVk (ORCPT ); Mon, 27 Feb 2017 23:21:40 -0500 Received: from mail-pg0-f44.google.com ([74.125.83.44]:36258 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbdB1EVi (ORCPT ); Mon, 27 Feb 2017 23:21:38 -0500 From: Kevin Hilman To: =?utf-8?Q?Micha=C5=82?= Zegan Cc: Carlo Caione , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-mmc@vger.kernel.org, Ulf Hansson Subject: Re: [PATCH] mmc: meson-gx: fix error path when driver initialization fails before enabling clocks Organization: BayLibre References: <20170218170647.5860-1-webczat@webczatnet.pl> Date: Mon, 27 Feb 2017 19:08:29 -0800 In-Reply-To: <20170218170647.5860-1-webczat@webczatnet.pl> (=?utf-8?Q?=22M?= =?utf-8?Q?icha=C5=82?= Zegan"'s message of "Sat, 18 Feb 2017 18:06:46 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (darwin) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v1S4Li4N005954 Michał Zegan writes: > This patch fixes the case where meson_mmc_probe function fails before > core_clk is enabled. > Originally, that would result in a try to disable the core clock, and if > it was not already enabled, it would result in a kernel warning. > This issue is similar to the one with div_clk. > Fix it by introducing another error path used only between successfully > enabling the core clock, and successfully enabling the div clock. > That would ensure that core clock is disabled only if it was enabled before. > > Signed-off-by: Michał Zegan Acked-by: Kevin Hilman > --- > applies on top of Heiner's patchset v3 > https://patchwork.kernel.org/patch/9581057/ > That in turn applies on top of https://patchwork.kernel.org/patch/9561215/ > > drivers/mmc/host/meson-gx-mmc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c > index 336b6a2e94c6..7917a3fe51ad 100644 > --- a/drivers/mmc/host/meson-gx-mmc.c > +++ b/drivers/mmc/host/meson-gx-mmc.c > @@ -752,7 +752,7 @@ static int meson_mmc_probe(struct platform_device *pdev) > > ret = meson_mmc_clk_init(host); > if (ret) > - goto free_host; > + goto err_core_clk; > > ret = devm_request_threaded_irq(&pdev->dev, irq, meson_mmc_irq, > meson_mmc_irq_thread, IRQF_SHARED, > @@ -781,8 +781,9 @@ static int meson_mmc_probe(struct platform_device *pdev) > > err_div_clk: > clk_disable_unprepare(host->cfg_div_clk); > -free_host: > +err_core_clk: > clk_disable_unprepare(host->core_clk); > +free_host: > mmc_free_host(mmc); > return ret; > }