From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Wed, 3 Jan 2018 07:33:35 +0000
Subject: PCI: dwc: artpec6: Fix return value check in artpec6_add_pcie_ep()
Git-commit: c68febfd68e0f01d90da15bd10e94b42544f0f68
Patch-mainline: v4.16-rc1
References: fate#326536, fate#326532
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
---
drivers/pci/dwc/pcie-artpec6.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c
index 312f21b6e013..b1e98205110f 100644
--- a/drivers/pci/dwc/pcie-artpec6.c
+++ b/drivers/pci/dwc/pcie-artpec6.c
@@ -485,8 +485,8 @@ static int artpec6_add_pcie_ep(struct artpec6_pcie *artpec6_pcie,
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");
pci->dbi_base2 = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(pci->dbi_base2))
- return PTR_ERR(pci->dbi_base2);
+ if (!pci->dbi_base2)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");
if (!res)
--
2.11.0