redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Wei Yongjun 2015-04-16 20:18:50 +08:00 committed by Michael Ellerman
parent a368c29cf1
commit 35a7f41cc6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/sysdev/ppc4xx_hsta_msi.c
View File

@ -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;
}