diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-07-10 09:22:25 +0200 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2017-08-11 12:53:21 +0200 |
| commit | 9e80dbd87286d3252ac2f78c6465c16e2ec8d476 (patch) | |
| tree | 284dc87f3c0a0043cc0626b4d177afca793b4130 /drivers/clocksource | |
| parent | clocksource/drivers/em_sti: Fix error return codes in em_sti_probe() (diff) | |
| download | linux-9e80dbd87286d3252ac2f78c6465c16e2ec8d476.tar.xz linux-9e80dbd87286d3252ac2f78c6465c16e2ec8d476.zip | |
clocksource/drivers/timer-of: Checking for IS_ERR() instead of NULL
The current code checks the return value of the of_io_request_and_map()
function as it was returning a NULL pointer in case of error.
However, it returns an error code encoded in the pointer return value, not a
NULL value. Fix this by checking the returned pointer against IS_ERR() and
return the error with PTR_ERR().
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-of.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c index d509b500a7b5..4d7aef9d9c15 100644 --- a/drivers/clocksource/timer-of.c +++ b/drivers/clocksource/timer-of.c @@ -128,9 +128,9 @@ static __init int timer_base_init(struct device_node *np, const char *name = of_base->name ? of_base->name : np->full_name; of_base->base = of_io_request_and_map(np, of_base->index, name); - if (!of_base->base) { + if (IS_ERR(of_base->base)) { pr_err("Failed to iomap (%s)\n", name); - return -ENXIO; + return PTR_ERR(of_base->base); } return 0; |