2014-01-16 08:29:04

by Wei Yongjun

Subject: [PATCH -next] clocksource: keystone: Fix return value check in keystone_timer_init()

From: Wei Yongjun <[email protected]>

In case of error, function of_clk_get() returns ERR_PTR()
and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/clocksource/timer-keystone.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c
index cbac8d0..4ca05ec 100644
--- a/drivers/clocksource/timer-keystone.c
+++ b/drivers/clocksource/timer-keystone.c
@@ -168,7 +168,7 @@ static void __init keystone_timer_init(struct device_node *np)
}

clk = of_clk_get(np, 0);
- if (!clk) {
+ if (IS_ERR(clk)) {
pr_err("%s: failed to get clock\n", __func__);
iounmap(timer.base);
return;

2014-01-16 09:37:25

by Daniel Lezcano

Subject: Re: [PATCH -next] clocksource: keystone: Fix return value check in keystone_timer_init()

On 01/16/2014 09:29 AM, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> In case of error, function of_clk_get() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value
> check should be replaced with IS_ERR().
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/clocksource/timer-keystone.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c
> index cbac8d0..4ca05ec 100644
> --- a/drivers/clocksource/timer-keystone.c
> +++ b/drivers/clocksource/timer-keystone.c
> @@ -168,7 +168,7 @@ static void __init keystone_timer_init(struct device_node *np)
> }
>
> clk = of_clk_get(np, 0);
> - if (!clk) {
> + if (IS_ERR(clk)) {
> pr_err("%s: failed to get clock\n", __func__);
> iounmap(timer.base);
> return;

Good catch. Applied for 3.15.

Thanks for the fix.

-- Daniel





--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog