mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

net: axienet: Fix return value check in axienet_probe()

Browse source 
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: 46aa27df88 ('net: axienet: Use devm_* calls')
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wei Yongjun 2016-07-19 11:23:24 +00:00 committed by David S. Miller
parent 4599f772e7
commit 3ad7b1477e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View file

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