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