* [PATCH] mmci-omap: remove bogus check for host->iclk
@ 2009-11-01 12:03 Ladislav.Michl
0 siblings, 0 replies; only message in thread
From: Ladislav.Michl @ 2009-11-01 12:03 UTC (permalink / raw)
To: Andrew Morton; +Cc: Jarkko Lavinen, linux-mmc
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>
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 5d773b8..c6d7e8e 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)
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:
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-01 11:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-01 12:03 [PATCH] mmci-omap: remove bogus check for host->iclk Ladislav.Michl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox