summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2015-05-02 17:03:23 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-05-05 10:35:58 +0200
commitff569fcd7123d9a9176d59174a27bab9a4fad328 (patch)
tree509d1c784f1bfb01c440ce18f91928cd33fa79a5 /drivers/clocksource
parent1ef09cd713c90781b683a0b4e0a874803c172b1d (diff)
downloadblackbird-op-linux-ff569fcd7123d9a9176d59174a27bab9a4fad328.tar.gz
blackbird-op-linux-ff569fcd7123d9a9176d59174a27bab9a4fad328.zip
clocksource: asm9260: 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-4-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/asm9260_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c
index 2c9c993727c8..4c2ba59897e8 100644
--- a/drivers/clocksource/asm9260_timer.c
+++ b/drivers/clocksource/asm9260_timer.c
@@ -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);
OpenPOWER on IntegriCloud