mmci-omap: remove bogus check for host->iclk

[linux-2.6-block.git] / drivers / mmc / host / omap.c

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 5f970e253e500f2709dea4e04bb3b45565f5c39a..c6d7e8ecadbf586691d484cdbf7b94b7f4550913 100644 (file)
--- 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)
                goto err_ioremap;
 
        host->iclk = clk_get(&pdev->dev, "ick");
-       if (IS_ERR(host->iclk))
+       if (IS_ERR(host->iclk)) {
+               ret = PTR_ERR(host->iclk);
                goto err_free_mmc_host;
+       }
        clk_enable(host->iclk);
 
        host->fclk = clk_get(&pdev->dev, "fck");
@@ -1500,10 +1502,8 @@ err_free_irq:
 err_free_fclk:
        clk_put(host->fclk);
 err_free_iclk:
-       if (host->iclk != NULL) {
-               clk_disable(host->iclk);
-               clk_put(host->iclk);
-       }
+       clk_disable(host->iclk);
+       clk_put(host->iclk);
 err_free_mmc_host:
        iounmap(host->virt_base);
 err_ioremap: