linux-kernel - [tip:timers/core] clocksource: sun5i: Fix of_io_request_and

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 5 May 2015 01:40:28 -0700
From:	tip-bot for Maxime Ripard <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	mingo@...nel.org, linux-kernel@...r.kernel.org,
	maxime.ripard@...e-electrons.com, hpa@...or.com,
	daniel.lezcano@...aro.org, tglx@...utronix.de
Subject: [tip:timers/core] clocksource: sun5i:
  Fix of_io_request_and_map error check

Commit-ID:  9fa8cc0a85c774b75218ba5f385792be387c190b
Gitweb:     http://git.kernel.org/tip/9fa8cc0a85c774b75218ba5f385792be387c190b
Author:     Maxime Ripard <maxime.ripard@...e-electrons.com>
AuthorDate: Sat, 2 May 2015 17:03:25 +0200
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 5 May 2015 10:35:58 +0200

clocksource: sun5i: 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@...e-electrons.com>
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Link: http://lkml.kernel.org/r/1430579006-32702-6-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 drivers/clocksource/timer-sun5i.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index 28aa4b7..0ffb4ea 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -324,7 +324,7 @@ static void __init sun5i_timer_init(struct device_node *node)
 	int irq;
 
 	timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
-	if (!timer_base)
+	if (IS_ERR(timer_base))
 		panic("Can't map registers");
 
 	irq = irq_of_parse_and_map(node, 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/