summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-07-20 09:20:59 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2014-12-29 05:45:43 +0100
commite144d4edbce67ea269d181f81b9c5ef631743430 (patch)
tree12d8068adf71a164a9e999c5420d2cfe66d60ccc
parentpowerpc/xmon: use isspace/isxdigit/isalnum from linux/ctype.h (diff)
downloadlinux-e144d4edbce67ea269d181f81b9c5ef631743430.tar.xz
linux-e144d4edbce67ea269d181f81b9c5ef631743430.zip
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>
-rw-r--r--arch/powerpc/sysdev/ppc4xx_hsta_msi.c2
1 files changed, 1 insertions, 1 deletions
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;
}