* [PATCH] powerpc/4xx: Fix return value check in hsta_msi_probe()
@ 2015-04-16 12:18 weiyj_lk
2015-08-10 9:27 ` Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2015-04-16 12:18 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
Wolfram Sang, Alexander Gordeev, Wei Yongjun, Thomas Gleixner,
Jiang Liu, Alistair Popple
Cc: linuxppc-dev, linux-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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>
---
arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index f366d2d..49e24f5 100644
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
@@ -130,7 +130,7 @@ static int hsta_msi_probe(struct platform_device *pdev)
int irq, ret, irq_count;
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;
}
@@ -155,7 +155,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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: powerpc/4xx: Fix return value check in hsta_msi_probe()
2015-04-16 12:18 [PATCH] powerpc/4xx: Fix return value check in hsta_msi_probe() weiyj_lk
@ 2015-08-10 9:27 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2015-08-10 9:27 UTC (permalink / raw)
To: weiyj_lk, Benjamin Herrenschmidt, Paul Mackerras, Wolfram Sang,
Alexander Gordeev, Wei Yongjun, Thomas Gleixner, Jiang Liu,
Alistair Popple
Cc: linuxppc-dev, linux-kernel
On Thu, 2015-16-04 at 12:18:50 UTC, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/35a7f41cc6bb7013e344
cheers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-10 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-16 12:18 [PATCH] powerpc/4xx: Fix return value check in hsta_msi_probe() weiyj_lk
2015-08-10 9:27 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).