diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-10-08 22:46:00 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2012-11-09 19:49:15 -0500 |
commit | 0de9f23a2859a4aec5db210887c7457e0c24b9ca (patch) | |
tree | e853f255bc04dac6b7ea8ab03c0e2d026a3c7fbb /drivers/clk | |
parent | 78e30d12168b540d426e4584b3d485e80fbc2a51 (diff) |
clk: fix return value check in bcm2835_init_clocks()
In case of error, the function clk_register_fixed_rate() returns
ERR_PTR() and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().
dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk-bcm2835.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/clk-bcm2835.c b/drivers/clk/clk-bcm2835.c index 67ad16b20b8..b61ee2c5af8 100644 --- a/drivers/clk/clk-bcm2835.c +++ b/drivers/clk/clk-bcm2835.c | |||
@@ -33,17 +33,17 @@ void __init bcm2835_init_clocks(void) | |||
33 | 33 | ||
34 | clk = clk_register_fixed_rate(NULL, "sys_pclk", NULL, CLK_IS_ROOT, | 34 | clk = clk_register_fixed_rate(NULL, "sys_pclk", NULL, CLK_IS_ROOT, |
35 | 250000000); | 35 | 250000000); |
36 | if (!clk) | 36 | if (IS_ERR(clk)) |
37 | pr_err("sys_pclk not registered\n"); | 37 | pr_err("sys_pclk not registered\n"); |
38 | 38 | ||
39 | clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT, | 39 | clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT, |
40 | 126000000); | 40 | 126000000); |
41 | if (!clk) | 41 | if (IS_ERR(clk)) |
42 | pr_err("apb_pclk not registered\n"); | 42 | pr_err("apb_pclk not registered\n"); |
43 | 43 | ||
44 | clk = clk_register_fixed_rate(NULL, "uart0_pclk", NULL, CLK_IS_ROOT, | 44 | clk = clk_register_fixed_rate(NULL, "uart0_pclk", NULL, CLK_IS_ROOT, |
45 | 3000000); | 45 | 3000000); |
46 | if (!clk) | 46 | if (IS_ERR(clk)) |
47 | pr_err("uart0_pclk not registered\n"); | 47 | pr_err("uart0_pclk not registered\n"); |
48 | ret = clk_register_clkdev(clk, NULL, "20201000.uart"); | 48 | ret = clk_register_clkdev(clk, NULL, "20201000.uart"); |
49 | if (ret) | 49 | if (ret) |
@@ -51,7 +51,7 @@ void __init bcm2835_init_clocks(void) | |||
51 | 51 | ||
52 | clk = clk_register_fixed_rate(NULL, "uart1_pclk", NULL, CLK_IS_ROOT, | 52 | clk = clk_register_fixed_rate(NULL, "uart1_pclk", NULL, CLK_IS_ROOT, |
53 | 125000000); | 53 | 125000000); |
54 | if (!clk) | 54 | if (IS_ERR(clk)) |
55 | pr_err("uart1_pclk not registered\n"); | 55 | pr_err("uart1_pclk not registered\n"); |
56 | ret = clk_register_clkdev(clk, NULL, "20215000.uart"); | 56 | ret = clk_register_clkdev(clk, NULL, "20215000.uart"); |
57 | if (ret) | 57 | if (ret) |