[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1454768659-32720-1-git-send-email-weiyj_lk@163.com>
Date: Sat, 6 Feb 2016 22:24:19 +0800
From: weiyj_lk@....com
To: Ralf Baechle <ralf@...ux-mips.org>,
Matthias Brugger <matthias.bgg@...il.com>,
John Crispin <blogic@...nwrt.org>
Cc: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>,
linux-mips@...ux-mips.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH] MIPS: pci-mt7620: Fix return value check in mt7620_pci_probe()
From: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
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 <yongjun_wei@...ndmicro.com.cn>
---
arch/mips/pci/pci-mt7620.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/mips/pci/pci-mt7620.c b/arch/mips/pci/pci-mt7620.c
index a009ee4..044c1cd 100644
--- a/arch/mips/pci/pci-mt7620.c
+++ b/arch/mips/pci/pci-mt7620.c
@@ -297,12 +297,12 @@ static int mt7620_pci_probe(struct platform_device *pdev)
return PTR_ERR(rstpcie0);
bridge_base = devm_ioremap_resource(&pdev->dev, bridge_res);
- if (!bridge_base)
- return -ENOMEM;
+ if (IS_ERR(bridge_base))
+ return PTR_ERR(bridge_base);
pcie_base = devm_ioremap_resource(&pdev->dev, pcie_res);
- if (!pcie_base)
- return -ENOMEM;
+ if (IS_ERR(pcie_base))
+ return PTR_ERR(pcie_base);
iomem_resource.start = 0;
iomem_resource.end = ~0;
Powered by blists - more mailing lists