OSDN Git Service

net: axienet: Fix return value check in axienet_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 19 Jul 2016 11:23:24 +0000 (11:23 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Jul 2016 21:46:00 +0000 (14:46 -0700)
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>
drivers/net/ethernet/xilinx/xilinx_axienet_main.c

index 9c82993..36ee7ab 100644 (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);