diff options
Diffstat (limited to 'drivers/mmc/host/omap.c')
-rw-r--r-- | drivers/mmc/host/omap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 5f970e253e50..c6d7e8ecadbf 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -1459,8 +1459,10 @@ static int __init mmc_omap_probe(struct platform_device *pdev) | |||
1459 | goto err_ioremap; | 1459 | goto err_ioremap; |
1460 | 1460 | ||
1461 | host->iclk = clk_get(&pdev->dev, "ick"); | 1461 | host->iclk = clk_get(&pdev->dev, "ick"); |
1462 | if (IS_ERR(host->iclk)) | 1462 | if (IS_ERR(host->iclk)) { |
1463 | ret = PTR_ERR(host->iclk); | ||
1463 | goto err_free_mmc_host; | 1464 | goto err_free_mmc_host; |
1465 | } | ||
1464 | clk_enable(host->iclk); | 1466 | clk_enable(host->iclk); |
1465 | 1467 | ||
1466 | host->fclk = clk_get(&pdev->dev, "fck"); | 1468 | host->fclk = clk_get(&pdev->dev, "fck"); |
@@ -1500,10 +1502,8 @@ err_free_irq: | |||
1500 | err_free_fclk: | 1502 | err_free_fclk: |
1501 | clk_put(host->fclk); | 1503 | clk_put(host->fclk); |
1502 | err_free_iclk: | 1504 | err_free_iclk: |
1503 | if (host->iclk != NULL) { | 1505 | clk_disable(host->iclk); |
1504 | clk_disable(host->iclk); | 1506 | clk_put(host->iclk); |
1505 | clk_put(host->iclk); | ||
1506 | } | ||
1507 | err_free_mmc_host: | 1507 | err_free_mmc_host: |
1508 | iounmap(host->virt_base); | 1508 | iounmap(host->virt_base); |
1509 | err_ioremap: | 1509 | err_ioremap: |