A NULL is a valid clk cookie, so we should not be tested with
IS_ERR_OR_NULL(). Replace it with IS_ERR().
Signed-off-by: Andrew Lunn <andrew@xxxxxxx>
---
This patch depends on Thomas Petazzoni DT patches for mvsdio, which changed
the order of resource allocation etc.
Simon
You are correct about the indentation. As suggested, i moved the
disable_unprepare() inside if (host).
It should no longer be possible to have imbalanced clk operations:
If mmc_alloc_host() fails, it goes to out. host is NULL, no clk calls.
All other goto out occur after the clk_get() and when host is !NULL. clk
calls are then made when !IS_ERR(host->clk), keeping this balanced.
drivers/mmc/host/mvsdio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index feb16bd..196f085 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -818,14 +818,14 @@ out:
mmc_gpio_free_ro(mmc);
if (host->base)
iounmap(host->base);
+ if (!IS_ERR(host->clk)) {
+ clk_disable_unprepare(host->clk);
+ clk_put(host->clk);
+ }
}
if (r)
release_resource(r);
if (mmc)
- if (!IS_ERR_OR_NULL(host->clk)) {
- clk_disable_unprepare(host->clk);
- clk_put(host->clk);
- }
mmc_free_host(mmc);
return ret;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
