diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-10-09 10:46:00 +0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-11-09 16:49:15 -0800 |
| commit | 0de9f23a2859a4aec5db210887c7457e0c24b9ca (patch) | |
| tree | e853f255bc04dac6b7ea8ab03c0e2d026a3c7fbb | |
| parent | 78e30d12168b540d426e4584b3d485e80fbc2a51 (diff) | |
| download | blackbird-op-linux-0de9f23a2859a4aec5db210887c7457e0c24b9ca.tar.gz blackbird-op-linux-0de9f23a2859a4aec5db210887c7457e0c24b9ca.zip | |
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>
| -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 67ad16b20b81..b61ee2c5af84 100644 --- a/drivers/clk/clk-bcm2835.c +++ b/drivers/clk/clk-bcm2835.c @@ -33,17 +33,17 @@ void __init bcm2835_init_clocks(void) clk = clk_register_fixed_rate(NULL, "sys_pclk", NULL, CLK_IS_ROOT, 250000000); - if (!clk) + if (IS_ERR(clk)) pr_err("sys_pclk not registered\n"); clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT, 126000000); - if (!clk) + if (IS_ERR(clk)) pr_err("apb_pclk not registered\n"); clk = clk_register_fixed_rate(NULL, "uart0_pclk", NULL, CLK_IS_ROOT, 3000000); - if (!clk) + if (IS_ERR(clk)) pr_err("uart0_pclk not registered\n"); ret = clk_register_clkdev(clk, NULL, "20201000.uart"); if (ret) @@ -51,7 +51,7 @@ void __init bcm2835_init_clocks(void) clk = clk_register_fixed_rate(NULL, "uart1_pclk", NULL, CLK_IS_ROOT, 125000000); - if (!clk) + if (IS_ERR(clk)) pr_err("uart1_pclk not registered\n"); ret = clk_register_clkdev(clk, NULL, "20215000.uart"); if (ret) |
