Browse Source

MIPS: pci-mt7620: Fix return value check in mt7620_pci_probe()

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@trendmicro.com.cn>
Acked-by: John Crispin <blogic@openwrt.org>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12451/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Wei Yongjun 10 years ago
parent
commit
aaa0bf22cb
1 changed files with 4 additions and 4 deletions
  1. 4 4
      arch/mips/pci/pci-mt7620.c

+ 4 - 4
arch/mips/pci/pci-mt7620.c

@@ -297,12 +297,12 @@ static int mt7620_pci_probe(struct platform_device *pdev)
 		return PTR_ERR(rstpcie0);
 		return PTR_ERR(rstpcie0);
 
 
 	bridge_base = devm_ioremap_resource(&pdev->dev, bridge_res);
 	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);
 	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.start = 0;
 	iomem_resource.end = ~0;
 	iomem_resource.end = ~0;