From patchwork Fri Sep 16 13:45:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 9335843 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 5802A60839 for ; Fri, 16 Sep 2016 13:45:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4ABB029FB0 for ; Fri, 16 Sep 2016 13:45:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E82029FC3; Fri, 16 Sep 2016 13:45:27 +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_ADSP_CUSTOM_MED, 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 453F229FB0 for ; Fri, 16 Sep 2016 13:45:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757939AbcIPNpY (ORCPT ); Fri, 16 Sep 2016 09:45:24 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:33676 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758059AbcIPNpY (ORCPT ); Fri, 16 Sep 2016 09:45:24 -0400 Received: by mail-pa0-f66.google.com with SMTP id oz2so3501354pac.0 for ; Fri, 16 Sep 2016 06:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nL4ElRMOdbpH9cuMltmUKSArMAmDmKrr8IGaYwiUQ0c=; b=lDe/OXQveoZl+UhIWpjCsvNlKHLqSgskfxPTs04HbQKb3EXSPPNh0FGQiWqZGBkEPy qGRaI/Qx5yO5KvQYs0OB8cyBPMYKwmCLAuVR77eYwhkD/Ck81NSpEON1GOTWiLA7Jxhk HJkAQzTlK1MNLJpN2GKoHAWi/tZg2Ap2rJEwHnKusZWIxNz86GBxl4QorhK7+jAPb6mF KoS/HIDAzzbbjIrWm4Zk/oFtC+BjH9JBkB9GxwnMOkgDlnwfBPYzhCf++g6wO1wLIb84 Cw12XB7ilMtzr1LWqb9hucxJIQUXtPLXqQCTXYNwzDgD0qf++uwmIF1mo4cpxrfDLS4T A7Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nL4ElRMOdbpH9cuMltmUKSArMAmDmKrr8IGaYwiUQ0c=; b=UoLbRT+lO+MdThHo9c5gpBCwUjsKAFLCFAAWq53XLBdbtNDSKrov3OZxS2PXgkZMQ5 lixfHizWL8fWLZ1aU2+9R7J89ZkMbsBNoI50GT2kc+Qw35pIkC1n7sUefxMlP1PX5rJg aiWH6NfEaU1uTLofgzig/9n44yNNhbJpnnrOLSLXEXQCVtm/dnMudjYj/aITFedR3uuf kGwkLGN4r8UNCKeDQBC/VZijyGNNGCKHejiFw7bMoRg4Jr+uTqC/mb72QbA9h7xHTukz XXc4qgCshBzoWxQVhysiuVnACzGCdINn0B3UvNqWyomNjcMw4sitTl1KyQyjiSG00Kef 0otg== X-Gm-Message-State: AE9vXwMF6nvWy0o+nM2iDwvdwSMdHQOYz8jafG+s6bb1aN19sOWNrNd5j54l6Fy6cINKHQ== X-Received: by 10.66.245.177 with SMTP id xp17mr23428544pac.118.1474033523294; Fri, 16 Sep 2016 06:45:23 -0700 (PDT) Received: from localhost.localdomain.localdomain (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id p17sm52602218pfi.7.2016.09.16.06.45.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 06:45:22 -0700 (PDT) From: Wei Yongjun To: Mark Brown , Kamal Dasu Cc: Wei Yongjun , linux-spi@vger.kernel.org Subject: [PATCH -next] spi: bcm-qspi: Fix return value check in bcm_qspi_probe() Date: Fri, 16 Sep 2016 13:45:17 +0000 Message-Id: <1474033517-20430-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun In case of error, the function kcalloc() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver") Signed-off-by: Wei Yongjun --- drivers/spi/spi-bcm-qspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-spi" 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/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index 8fff43e..b1bc823 100644 --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c @@ -1175,8 +1175,8 @@ int bcm_qspi_probe(struct platform_device *pdev, qspi->dev_ids = kcalloc(num_irqs, sizeof(struct bcm_qspi_dev_id), GFP_KERNEL); - if (IS_ERR(qspi->dev_ids)) { - ret = PTR_ERR(qspi->dev_ids); + if (!qspi->dev_ids) { + ret = -ENOMEM; goto qspi_probe_err; }