Skip to content

Commit

Permalink
mmci-omap: remove bogus check for host->iclk
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ladislav Michl authored and Linus Torvalds committed Dec 15, 2009
1 parent 7e30b8d commit e799acb
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/mmc/host/omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -1500,10 +1502,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
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:
Expand Down

0 comments on commit e799acb

Please sign in to comment.