From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756935AbbEEIk3 (ORCPT ); Tue, 5 May 2015 04:40:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47885 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756884AbbEEIkY (ORCPT ); Tue, 5 May 2015 04:40:24 -0400 Date: Tue, 5 May 2015 01:40:10 -0700 From: tip-bot for Maxime Ripard Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, maxime.ripard@free-electrons.com, daniel.lezcano@linaro.org, tglx@linutronix.de Reply-To: maxime.ripard@free-electrons.com, tglx@linutronix.de, daniel.lezcano@linaro.org, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1430579006-32702-5-git-send-email-maxime.ripard@free-electrons.com> References: <1430579006-32702-5-git-send-email-maxime.ripard@free-electrons.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] clocksource: integrator: Fix of_io_request_and_map error check Git-Commit-ID: bd580e7ed4add8ce9b2c1dd1911f8fb9d444128b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bd580e7ed4add8ce9b2c1dd1911f8fb9d444128b Gitweb: http://git.kernel.org/tip/bd580e7ed4add8ce9b2c1dd1911f8fb9d444128b Author: Maxime Ripard AuthorDate: Sat, 2 May 2015 17:03:24 +0200 Committer: Thomas Gleixner 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 Cc: Daniel Lezcano Link: http://lkml.kernel.org/r/1430579006-32702-5-git-send-email-maxime.ripard@free-electrons.com Signed-off-by: Thomas Gleixner --- 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);