Commit 3ad7b147 authored Jul 19, 2016 by Wei Yongjun Committed by David S. Miller Jul 20, 2016

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: 46aa27df ('net: axienet: Use devm_* calls')
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4599f772

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);