From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 20 Jul 2014 07:20:59 +0000 (+0800)
Subject: powerpc/4xx: Fix return value check in hsta_msi_probe()
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~12892^2~71
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e144d4edbce67ea269d181f81b9c5ef631743430;p=mirror_ubuntu-focal-kernel.git

powerpc/4xx: Fix return value check in hsta_msi_probe()

In case of error, the function ioremap() returns NULL
not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index ed9970ff8d94..f366d2d4c079 100644
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
@@ -145,7 +145,7 @@ static int hsta_msi_probe(struct platform_device *pdev)
 	ppc4xx_hsta_msi.address = mem->start;
 	ppc4xx_hsta_msi.data = ioremap(mem->start, resource_size(mem));
 	ppc4xx_hsta_msi.irq_count = irq_count;
-	if (IS_ERR(ppc4xx_hsta_msi.data)) {
+	if (!ppc4xx_hsta_msi.data) {
 		dev_err(dev, "Unable to map memory\n");
 		return -ENOMEM;
 	}