]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
clocksource/drivers/timer-of: Checking for IS_ERR() instead of NULL
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 10 Jul 2017 07:22:25 +0000 (10:22 +0300)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 11 Aug 2017 10:53:21 +0000 (12:53 +0200)
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>
drivers/clocksource/timer-of.c

index d509b500a7b5f8565514352a0313cb4704976042..4d7aef9d9c15422df0e9973e72379b2e21256f47 100644 (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;