]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clocksource: integrator: Fix of_io_request_and_map error check
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Sat, 2 May 2015 15:03:24 +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-5-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/clocksource/timer-integrator-ap.c

index b9efd30513d56214612913dfc0f0a30b9464ea70..c97d1980c0f856f37b3f264d6b525f3a9e68540a 100644 (file)
@@ -166,7 +166,7 @@ static void __init integrator_ap_timer_init_of(struct device_node *node)
        struct device_node *sec_node;
 
        base = of_io_request_and_map(node, 0, "integrator-timer");
-       if (!base)
+       if (IS_ERR(base))
                return;
 
        clk = of_clk_get(node, 0);