AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
Remove check for host->iclk being NULL from error path since we already
know it is non-null and use return value from clk_get.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ladislav Michl 2009-12-14 18:01:24 -08:00 committed by Linus Torvalds
parent 7e30b8decb
commit e799acb2ed
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/host/omap.c
View File

@ -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 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
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_disable(host->iclk); clk_put(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: