From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752518AbbEBPFG (ORCPT ); Sat, 2 May 2015 11:05:06 -0400 Received: from down.free-electrons.com ([37.187.137.238]:33221 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751948AbbEBPFD (ORCPT ); Sat, 2 May 2015 11:05:03 -0400 From: Maxime Ripard To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Mike Turquette , Stephen Boyd , linux-clk@vger.kernel.org Subject: [PATCH 1/6] clk: asm9260: Fix of_io_request_and_map error check Date: Sat, 2 May 2015 17:03:21 +0200 Message-Id: <1430579006-32702-2-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: Mike Turquette Cc: Stephen Boyd Cc: linux-clk@vger.kernel.org --- drivers/clk/clk-asm9260.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk-asm9260.c b/drivers/clk/clk-asm9260.c index 88f4ff6916fe..90897af8d9f7 100644 --- a/drivers/clk/clk-asm9260.c +++ b/drivers/clk/clk-asm9260.c @@ -274,7 +274,7 @@ static void __init asm9260_acc_init(struct device_node *np) u32 accuracy = 0; base = of_io_request_and_map(np, 0, np->name); - if (!base) + if (IS_ERR(base)) panic("%s: unable to map resource", np->name); /* register pll */ -- 2.3.6