Messages in this thread Patch in this message | | | Date | Tue, 5 May 2015 01:39:51 -0700 | From | tip-bot for Maxime Ripard <> | Subject | [tip:timers/core] clocksource: asm9260: Fix of_io_request_and_map error check |
| |
Commit-ID: ff569fcd7123d9a9176d59174a27bab9a4fad328 Gitweb: http://git.kernel.org/tip/ff569fcd7123d9a9176d59174a27bab9a4fad328 Author: Maxime Ripard <maxime.ripard@free-electrons.com> AuthorDate: Sat, 2 May 2015 17:03:23 +0200 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 5 May 2015 10:35:58 +0200
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> --- drivers/clocksource/asm9260_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c index 2c9c993..4c2ba59 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);
| |