summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-21 08:35:18 +0200
committerMike Turquette <mturquette@linaro.org>2012-10-29 19:06:19 +0100
commitcdfed3b21f10ecd1566c7d5b8d40f05b18d52bda (patch)
tree0a509c10b60aa8c53395b810fcced865b5bdf24e
parentclk: ux500: Update sdmmc clock to 100MHz for u8500 (diff)
downloadlinux-cdfed3b21f10ecd1566c7d5b8d40f05b18d52bda.tar.xz
linux-cdfed3b21f10ecd1566c7d5b8d40f05b18d52bda.zip
clk: fix return value check in of_fixed_clk_setup()
In case of error, the function clk_register_fixed_rate() returns ERR_PTR() not NULL pointer. The NULL test in the return value check should be replaced with IS_ERR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r--drivers/clk/clk-fixed-rate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-fixed-rate.c b/drivers/clk/clk-fixed-rate.c
index f5ec0eebd4d7..af78ed6b67ef 100644
--- a/drivers/clk/clk-fixed-rate.c
+++ b/drivers/clk/clk-fixed-rate.c
@@ -97,7 +97,7 @@ void __init of_fixed_clk_setup(struct device_node *node)
of_property_read_string(node, "clock-output-names", &clk_name);
clk = clk_register_fixed_rate(NULL, clk_name, NULL, CLK_IS_ROOT, rate);
- if (clk)
+ if (!IS_ERR(clk))
of_clk_add_provider(node, of_clk_src_simple_get, clk);
}
EXPORT_SYMBOL_GPL(of_fixed_clk_setup);