From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752911AbbEBPGx (ORCPT ); Sat, 2 May 2015 11:06:53 -0400 Received: from down.free-electrons.com ([37.187.137.238]:33230 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752276AbbEBPFF (ORCPT ); Sat, 2 May 2015 11:05:05 -0400 From: Maxime Ripard To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Daniel Lezcano , Thomas Gleixner Subject: [PATCH 3/6] clocksource: asm9260: Fix of_io_request_and_map error check Date: Sat, 2 May 2015 17:03:23 +0200 Message-Id: <1430579006-32702-4-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.3.6 In-Reply-To: <1430579006-32702-1-git-send-email-maxime.ripard@free-electrons.com> References: <1430579006-32702-1-git-send-email-maxime.ripard@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Thomas Gleixner --- 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 2c9c993727c8..4c2ba59897e8 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); -- 2.3.6