[PATCH 10/22] mmc: omap_hsmmc: reduce a bit the error handlers in probe()

Adrian Hunter
2011-05-05T11:52:22Z

From: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
---
drivers/mmc/host/omap_hsmmc.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a727bf8..7a153af 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2204,18 +2204,11 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
/* we start off in DISABLED state */
host->dpm_state = DISABLED;

- if (clk_enable(host->iclk) != 0) {
- clk_put(host->iclk);
- clk_put(host->fclk);
- goto err1;
- }
+ if (clk_enable(host->iclk) != 0)
+ goto err2;

- if (mmc_host_enable(host->mmc) != 0) {
- clk_disable(host->iclk);
- clk_put(host->iclk);
- clk_put(host->fclk);
- goto err1;
- }
+ if (mmc_host_enable(host->mmc) != 0)
+ goto err3;

if (cpu_is_omap2430()) {
host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
@@ -2382,7 +2375,9 @@ err_irq:
host->dma_ctrl_buf,
host->dma_ctrl_buf_phy);
mmc_host_disable(host->mmc);
+err3:
clk_disable(host->iclk);
+err2:
clk_put(host->fclk);
clk_put(host->iclk);
if (host->got_dbclk) {
--
1.7.0.4