|
@@ -1459,8 +1459,10 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
|
|
goto err_ioremap;
|
|
goto err_ioremap;
|
|
|
|
|
|
host->iclk = clk_get(&pdev->dev, "ick");
|
|
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;
|
|
goto err_free_mmc_host;
|
|
|
|
+ }
|
|
clk_enable(host->iclk);
|
|
clk_enable(host->iclk);
|
|
|
|
|
|
host->fclk = clk_get(&pdev->dev, "fck");
|
|
host->fclk = clk_get(&pdev->dev, "fck");
|
|
@@ -1500,10 +1502,8 @@ err_free_irq:
|
|
err_free_fclk:
|
|
err_free_fclk:
|
|
clk_put(host->fclk);
|
|
clk_put(host->fclk);
|
|
err_free_iclk:
|
|
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:
|
|
err_free_mmc_host:
|
|
iounmap(host->virt_base);
|
|
iounmap(host->virt_base);
|
|
err_ioremap:
|
|
err_ioremap:
|