mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Maxime Ripard <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	maxime.ripard@free-electrons.com, daniel.lezcano@linaro.org,
	tglx@linutronix.de
Subject: [tip:timers/core] clocksource: integrator: Fix of_io_request_and_map error check
Date: Tue, 5 May 2015 01:40:10 -0700	[thread overview]
Message-ID: <tip-bd580e7ed4add8ce9b2c1dd1911f8fb9d444128b@git.kernel.org> (raw)
In-Reply-To: <1430579006-32702-5-git-send-email-maxime.ripard@free-electrons.com>

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);

  reply	other threads:[~2015-05-05  8:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-02 15:03 [PATCH 0/6] Fix of_io_request_and_map error handling code Maxime Ripard
2015-05-02 15:03 ` [PATCH 1/6] clk: asm9260: Fix of_io_request_and_map error check Maxime Ripard
2015-05-11 19:43   ` Maxime Ripard
2015-05-13  7:35     ` Stephen Boyd
2015-05-02 15:03 ` [PATCH 2/6] clk: sunxi: " Maxime Ripard
2015-05-05 15:44   ` Maxime Ripard
2015-05-02 15:03 ` [PATCH 3/6] clocksource: asm9260: " Maxime Ripard
2015-05-05  8:39   ` [tip:timers/core] " tip-bot for Maxime Ripard
2015-05-02 15:03 ` [PATCH 4/6] clocksource: integrator: " Maxime Ripard
2015-05-05  8:40   ` tip-bot for Maxime Ripard [this message]
2015-05-02 15:03 ` [PATCH 5/6] clocksource: sun5i: " Maxime Ripard
2015-05-05  8:40   ` [tip:timers/core] " tip-bot for Maxime Ripard
2015-05-02 15:03 ` [PATCH 6/6] irqchip: vf610: " Maxime Ripard
2015-05-05  8:50   ` [tip:irq/core] " tip-bot for Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-bd580e7ed4add8ce9b2c1dd1911f8fb9d444128b@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome