From patchwork Tue Nov 19 03:40:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 3199881 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 46078C045B for ; Tue, 19 Nov 2013 03:40:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D88D20347 for ; Tue, 19 Nov 2013 03:40:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1173202FE for ; Tue, 19 Nov 2013 03:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751416Ab3KSDka (ORCPT ); Mon, 18 Nov 2013 22:40:30 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:52426 "EHLO mail-bk0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751788Ab3KSDka (ORCPT ); Mon, 18 Nov 2013 22:40:30 -0500 Received: by mail-bk0-f45.google.com with SMTP id mx13so632835bkb.18 for ; Mon, 18 Nov 2013 19:40:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=O5n4JUwDKd4nB24rHumADLuiFGhFIgEBG+lTCk979AE=; b=Y8jM8re1F7yySbkf7AzN3WMgrPu+OMC8MEzGXmUuFG6meDWasmGE3WWQs1dtggEEys blbLLf2a+XlpopqmG9RL7VnohDibZFQs5rrjSXGtAZ4XN3G4cZdcsP4ereqeggWZaUo0 g1zBk2zwsITOIO4/LvJVyjlz43t1xfDDKyp6UAjZP2ayuXf2WrJN8PEzaeBAXihLTuBo VIRVnqiiQNH/AK4Yg/4i9KSthqs7OSfz/FAQGFmzhZbca/GGiHUoa5pCPzDP9knFHWbl WYUfRZRXeX/1YfaZdp5BMRgh4OpIjc1afvCD33ofRHL6Fjc8insvXQiZ4NsWy+QWonWq 9tMg== MIME-Version: 1.0 X-Received: by 10.204.69.12 with SMTP id x12mr14397171bki.12.1384832429022; Mon, 18 Nov 2013 19:40:29 -0800 (PST) Received: by 10.204.74.130 with HTTP; Mon, 18 Nov 2013 19:40:28 -0800 (PST) Date: Tue, 19 Nov 2013 11:40:28 +0800 Message-ID: Subject: [PATCH] PCI: rcar: fix return value check in rcar_pci_probe() From: Wei Yongjun To: bhelgaas@google.com, valentine.barshak@cogentembedded.com Cc: yongjun_wei@trendmicro.com.cn, linux-pci@vger.kernel.org Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun In case of error, the function devm_ioremap_resource() 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 Reviewed-by: Jingoo Han --- drivers/pci/host/pci-rcar-gen2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index cbaa5c4..96d1182 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -276,8 +276,8 @@ static int __init rcar_pci_probe(struct platform_device *pdev) cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); reg = devm_ioremap_resource(&pdev->dev, cfg_res); - if (!reg) - return -ENODEV; + if (IS_ERR(reg)) + return PTR_ERR(reg); mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); if (!mem_res || !mem_res->start)