diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2015-04-16 20:18:50 +0800 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-08-06 16:33:46 +1000 |
| commit | 35a7f41cc6bb7013e344502b03c5583d04228bd3 (patch) | |
| tree | f3cbfb81316f225909ebb3962de7ea1373b1aa58 /arch/powerpc/sysdev | |
| parent | a368c29cf105485d2c34fb5d09d2dbe813e483e1 (diff) | |
| download | linux-stable-35a7f41cc6bb7013e344502b03c5583d04228bd3.tar.gz linux-stable-35a7f41cc6bb7013e344502b03c5583d04228bd3.tar.bz2 linux-stable-35a7f41cc6bb7013e344502b03c5583d04228bd3.zip | |
powerpc/4xx: Fix return value check in hsta_msi_probe()
In case of error, the functions platform_get_resource() and kmalloc()
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>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c index 87f9623ca805..502f08cfce61 100644 --- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c +++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c @@ -132,7 +132,7 @@ static int hsta_msi_probe(struct platform_device *pdev) struct pci_controller *phb; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (IS_ERR(mem)) { + if (!mem) { dev_err(dev, "Unable to get mmio space\n"); return -EINVAL; } @@ -157,7 +157,7 @@ static int hsta_msi_probe(struct platform_device *pdev) goto out; ppc4xx_hsta_msi.irq_map = kmalloc(sizeof(int) * irq_count, GFP_KERNEL); - if (IS_ERR(ppc4xx_hsta_msi.irq_map)) { + if (!ppc4xx_hsta_msi.irq_map) { ret = -ENOMEM; goto out1; } |