* [PATCH -next] net: axienet: Fix return value check in axienet_probe()
@ 2016-07-19 11:23 Wei Yongjun
2016-07-20 21:47 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2016-07-19 11:23 UTC (permalink / raw)
To: anirudh, John.Linn, michal.simek, soren.brinkmann,
srikanth.thokala
Cc: Wei Yongjun, netdev, linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
In case of error, the function of_parse_phandle() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.
Fixes: 46aa27df8853 ('net: axienet: Use devm_* calls')
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 9c82993..36ee7ab 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1541,9 +1541,9 @@ static int axienet_probe(struct platform_device *pdev)
/* Find the DMA node, map the DMA registers, and decode the DMA IRQs */
np = of_parse_phandle(pdev->dev.of_node, "axistream-connected", 0);
- if (IS_ERR(np)) {
+ if (!np) {
dev_err(&pdev->dev, "could not find DMA node\n");
- ret = PTR_ERR(np);
+ ret = -ENODEV;
goto free_netdev;
}
ret = of_address_to_resource(np, 0, &dmares);
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH -next] net: axienet: Fix return value check in axienet_probe()
2016-07-19 11:23 [PATCH -next] net: axienet: Fix return value check in axienet_probe() Wei Yongjun
@ 2016-07-20 21:47 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-07-20 21:47 UTC (permalink / raw)
To: weiyj_lk
Cc: anirudh, John.Linn, michal.simek, soren.brinkmann,
srikanth.thokala, yongjun_wei, netdev, linux-arm-kernel
From: Wei Yongjun <weiyj_lk@163.com>
Date: Tue, 19 Jul 2016 11:23:24 +0000
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function of_parse_phandle() returns NULL
> pointer not ERR_PTR(). The IS_ERR() test in the return value
> check should be replaced with NULL test.
>
> Fixes: 46aa27df8853 ('net: axienet: Use devm_* calls')
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-20 21:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-19 11:23 [PATCH -next] net: axienet: Fix return value check in axienet_probe() Wei Yongjun
2016-07-20 21:47 ` David Miller
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).