redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Dan Carpenter 2017-07-10 10:22:25 +03:00 committed by Daniel Lezcano
parent 5c23a558a6
commit 9e80dbd872
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/clocksource/timer-of.c
View File

@ -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;