[PATCH] clk: fix return value check in clk_get

From: Peter De Schrijver
Date: Fri Jul 20 2012 - 09:37:07 EST


of_clk_get_by_name returns an ERR_PTR on failure. Hence we should use IS_ERR()
and not just check for a non NULL value.

Signed-off-by: Peter De Schrijver <pdeschrijver@xxxxxxxxxx>
---
drivers/clk/clkdev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 8f87b0f..d423c9b 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -157,7 +157,7 @@ struct clk *clk_get(struct device *dev, const char *con_id)

if (dev) {
clk = of_clk_get_by_name(dev->of_node, con_id);
- if (clk && __clk_get(clk))
+ if (!IS_ERR(clk) && __clk_get(clk))
return clk;
}

--
1.7.7.rc0.72.g4b5ea.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/