From patchwork Fri Jun 17 17:24:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiyj_lk@163.com X-Patchwork-Id: 9184699 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB07A608A6 for ; Fri, 17 Jun 2016 17:25:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B8EE27EE2 for ; Fri, 17 Jun 2016 17:25:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FC9D28385; Fri, 17 Jun 2016 17:25:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A1D327EED for ; Fri, 17 Jun 2016 17:25:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755570AbcFQRZK (ORCPT ); Fri, 17 Jun 2016 13:25:10 -0400 Received: from m12-16.163.com ([220.181.12.16]:33000 "EHLO m12-16.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933291AbcFQRZI (ORCPT ); Fri, 17 Jun 2016 13:25:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=FM2lW sXjrzmV2zwbOFd8RBL8wmxrI3a/UpOCeE4Vk6o=; b=QFACTMXV8dculS+9JubP+ jBW26vEpRF4FWhEPx0e4cM64xiA/61FUBiHPDWypsxnqxxgVr8XUTqMJd5PVy9YC M3uGDK7mp2OeJfn2W2eofJQ9QayheSkewUIZbi+Vna42xyzKgA0GW73C/khzMm73 POn6Ob2MlrpnIFp3mqcEAc= Received: from localhost.localdomain.localdomain (unknown [117.36.101.242]) by smtp12 (Coremail) with SMTP id EMCowADHHPVHMmRXE9mBBA--.13584S3; Sat, 18 Jun 2016 01:24:24 +0800 (CST) From: weiyj_lk@163.com To: Michael Turquette , Stephen Boyd , Neil Armstrong Cc: Wei Yongjun , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] clk: Fix return value check in oxnas_stdclk_probe() Date: Fri, 17 Jun 2016 17:24:23 +0000 Message-Id: <1466184263-17890-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 X-CM-TRANSID: EMCowADHHPVHMmRXE9mBBA--.13584S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kCr4kWry5Wr13Cr1rZwb_yoWfCFX_uw 13urn7Ars09FsFgFWDKw1ayr9I9Fn8urZ5X3Wft3y3J34q9r15JrWYvrn8Zw45W3yrCrWY kwnxWr43uF13CjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUelD73UUUUU== X-Originating-IP: [117.36.101.242] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiNRqL1lSIOT3F2AABs2 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun In case of error, the function syscon_node_to_regmap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun Acked-by: Neil Armstrong --- drivers/clk/clk-oxnas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/clk/clk-oxnas.c b/drivers/clk/clk-oxnas.c index efba7d4..79bcb2e 100644 --- a/drivers/clk/clk-oxnas.c +++ b/drivers/clk/clk-oxnas.c @@ -144,9 +144,9 @@ static int oxnas_stdclk_probe(struct platform_device *pdev) return -ENOMEM; regmap = syscon_node_to_regmap(of_get_parent(np)); - if (!regmap) { + if (IS_ERR(regmap)) { dev_err(&pdev->dev, "failed to have parent regmap\n"); - return -EINVAL; + return PTR_ERR(regmap); } for (i = 0; i < ARRAY_SIZE(clk_oxnas_init); i++) {