diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-07-19 11:23:24 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-20 14:46:00 -0700 |
| commit | 3ad7b1477ef9b01988ac052b02be9cd410c95157 (patch) | |
| tree | 53ea52452a1ac01d3ea8fd9bf8e8b509d9a0c549 /drivers/net/ethernet/xilinx | |
| parent | 4599f772e7d94a25b0ecad203cdeabf1744b219c (diff) | |
| download | linux-3ad7b1477ef9b01988ac052b02be9cd410c95157.tar.bz2 | |
net: axienet: Fix return value check in axienet_probe()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx')
| -rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 |
1 files 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 9c82993b02e1..36ee7ab300ae 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); |