From: Kishon Vijay Abraham I <kishon@ti.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Tony Lindgren <tony@atomide.com>,
nsekhar@ti.com
Cc: devicetree@vger.kernel.org, kishon@ti.com,
linux-mmc@vger.kernel.org, Russell King <linux@armlinux.org.uk>,
linux-kernel@vger.kernel.org, Ravikumar Kattekola <rk@ti.com>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/16] mmc: host: omap_hsmmc: Fix error path sequence
Date: Fri, 16 Jun 2017 18:15:39 +0530 [thread overview]
Message-ID: <20170616124544.15046-12-kishon@ti.com> (raw)
In-Reply-To: <20170616124544.15046-1-kishon@ti.com>
Fix the error path sequence so that clk_disable, runtime_disable etc
are done in the reverse order of how they were enabled.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
drivers/mmc/host/omap_hsmmc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 9d59fe611498..967b7c7d4bd5 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2591,16 +2591,16 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
err_slot_name:
mmc_remove_host(mmc);
err_irq:
- device_init_wakeup(&pdev->dev, false);
if (!IS_ERR_OR_NULL(host->tx_chan))
dma_release_channel(host->tx_chan);
if (!IS_ERR_OR_NULL(host->rx_chan))
dma_release_channel(host->rx_chan);
+ if (host->dbclk)
+ clk_disable_unprepare(host->dbclk);
pm_runtime_dont_use_autosuspend(host->dev);
pm_runtime_put_sync(host->dev);
pm_runtime_disable(host->dev);
- if (host->dbclk)
- clk_disable_unprepare(host->dbclk);
+ device_init_wakeup(&pdev->dev, false);
err1:
err_gpio:
mmc_free_host(mmc);
--
2.11.0
next prev parent reply other threads:[~2017-06-16 12:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 12:45 [PATCH 00/16] omap_hsmmc: Add ADMA support and UHS/HS200/DDR support Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 02/16] mmc: host: omap_hsmmc: Separate setting voltage capabilities from bus power Kishon Vijay Abraham I
[not found] ` <20170616124544.15046-1-kishon-l0cyMroinI0@public.gmane.org>
2017-06-16 12:45 ` [PATCH 01/16] mmc: host: omap_hsmmc: Support pbias and vmmc_aux to switch to 1.8v Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 03/16] mmc: host: omap_hsmmc: Remove incorrect voltage switch sequence Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 04/16] mmc: host: omap_hsmmc: Add voltage switch support for UHS SD card Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 05/16] mmc: host: omap_hsmmc: Set clk rate to the max frequency Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 06/16] mmc: host: omap_hsmmc: Add tuning support Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 07/16] mmc: host: omap_hsmmc: Allow io voltage switch even for fixed vdd Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 08/16] mmc: host: omap_hsmmc: Add software timer when timeout greater than hardware capablility Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 09/16] mmc: host: omap_hsmmc: Prepare *set_timing() to be used for iodelay setting Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 10/16] mmc: host: omap_hsmmc: Add new compatible string to support dra7 Kishon Vijay Abraham I
2017-06-16 12:45 ` Kishon Vijay Abraham I [this message]
2017-06-16 12:45 ` [PATCH 12/16] mmc: host: omap_hsmmc: Add support to set IODELAY values Kishon Vijay Abraham I
2017-06-19 6:02 ` Tony Lindgren
2017-06-19 6:36 ` Kishon Vijay Abraham I
[not found] ` <810fba3e-a488-fa0d-5639-47f1c76ea2b6-l0cyMroinI0@public.gmane.org>
2017-06-19 7:25 ` Tony Lindgren
2017-06-19 7:54 ` Kishon Vijay Abraham I
2017-06-19 14:33 ` Tony Lindgren
[not found] ` <20170616124544.15046-13-kishon-l0cyMroinI0@public.gmane.org>
2017-06-23 18:52 ` Rob Herring
2017-06-16 12:45 ` [PATCH 13/16] mmc: host: omap_hsmmc: Remove *use_dma* member Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 14/16] mmc: host: omap_hsmmc: Enable ADMA2 Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 15/16] ARM: dts: dra7: Use new dra7-specific compatible string Kishon Vijay Abraham I
2017-06-16 12:45 ` [PATCH 16/16] ARM: dts: dra7: Add supported MMC/SD modes in MMC dt nodes Kishon Vijay Abraham I
2017-07-11 13:10 ` [PATCH 00/16] omap_hsmmc: Add ADMA support and UHS/HS200/DDR support Ulf Hansson
[not found] ` <CAPDyKFo+ORA=OpdikiUZWj3gpx+ssuqbC5MtqiFJneyJhu84dA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-07-11 13:57 ` Kishon Vijay Abraham I
2017-07-20 13:36 ` Kishon Vijay Abraham I
2017-08-03 10:40 ` Ulf Hansson
2017-08-03 10:55 ` Adrian Hunter
[not found] ` <1a668e7a-49b6-227c-def6-1cf9e21068cd-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-08-03 11:22 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170616124544.15046-12-kishon@ti.com \
--to=kishon@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=nsekhar@ti.com \
--cc=rk@ti.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox