summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2015-05-02 17:03:24 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-05-05 10:35:58 +0200
commitbd580e7ed4add8ce9b2c1dd1911f8fb9d444128b (patch)
treefd4a5374f903530b266e89b5e0ae64cb1d5c893d /drivers/clocksource
parentclocksource: asm9260: Fix of_io_request_and_map error check (diff)
downloadlinux-bd580e7ed4add8ce9b2c1dd1911f8fb9d444128b.tar.xz
linux-bd580e7ed4add8ce9b2c1dd1911f8fb9d444128b.zip
clocksource: integrator: Fix of_io_request_and_map error check
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>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/timer-integrator-ap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
index b9efd30513d5..c97d1980c0f8 100644
--- a/drivers/clocksource/timer-integrator-ap.c
+++ b/drivers/clocksource/timer-integrator-ap.c
@@ -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);