diff options
| author |   Pan Bian <bianpan2016@163.com> | 2017-10-30 16:50:01 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-11-01 12:17:44 +0900 |
| commit | d2083d0e92117598dd24ba270af12376f1fb8866 (patch) | |
| tree | 9c4ad398f11b477dbf1d222a965201d3f23f0c11 /drivers/net/ethernet/hisilicon/hns/hns_enet.c | |
| parent | net: lapbether: fix double free (diff) | |
| download | linux-dev-d2083d0e92117598dd24ba270af12376f1fb8866.tar.xz linux-dev-d2083d0e92117598dd24ba270af12376f1fb8866.zip | |
net: hns: set correct return value
The function of_parse_phandle() returns a NULL pointer if it cannot
resolve a phandle property to a device_node pointer. In function
hns_nic_dev_probe(), its return value is passed to PTR_ERR to extract
the error code. However, in this case, the extracted error code will
always be zero, which is unexpected.
Signed-off-by: Pan Bian <bianpan2016@163.com>
Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns/hns_enet.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c index 36520634c96a..e77192683dba 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c @@ -2369,8 +2369,8 @@ static int hns_nic_dev_probe(struct platform_device *pdev) priv->enet_ver = AE_VERSION_2; ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0); - if (IS_ERR_OR_NULL(ae_node)) { - ret = PTR_ERR(ae_node); + if (!ae_node) { + ret = -ENODEV; dev_err(dev, "not find ae-handle\n"); goto out_read_prop_fail; } |