clocksource: asm9260: Fix of_io_request_and_map error check
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Sat, 2 May 2015 15:03:23 +0000 (17:03 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 5 May 2015 08:35:58 +0000 (10:35 +0200)
of_io_request_and map returns an error pointer, but the current code assumes
that on error the returned pointer will be NULL.

Obviously, that makes the check completely useless. Change the test to actually
check for the proper error code.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: http://lkml.kernel.org/r/1430579006-32702-4-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/clocksource/asm9260_timer.c

index 2c9c993727c85a1975b845d3fe7b49d3115def97..4c2ba59897e84bda7c12368874e3c8f7716ae70c 100644 (file)
@@ -178,7 +178,7 @@ static void __init asm9260_timer_init(struct device_node *np)
        unsigned long rate;
 
        priv.base = of_io_request_and_map(np, 0, np->name);
-       if (!priv.base)
+       if (IS_ERR(priv.base))
                panic("%s: unable to map resource", np->name);
 
        clk = of_clk_get(np, 0);