diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2019-07-19 01:22:06 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-18 20:33:48 -0700 |
| commit | 269b7c5ff78264e3728b95828d219e0e0eeaec94 (patch) | |
| tree | cc677e7619affd9d8fb790e94e81df5009eb51e1 | |
| parent | ag71xx: fix error return code in ag71xx_probe() (diff) | |
| download | linux-dev-269b7c5ff78264e3728b95828d219e0e0eeaec94.tar.xz linux-dev-269b7c5ff78264e3728b95828d219e0e0eeaec94.zip | |
ag71xx: fix return value check in ag71xx_probe()
In case of error, the function of_get_mac_address() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/atheros/ag71xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c index 31d27808ddee..8b69d0d7e726 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c @@ -1735,9 +1735,9 @@ static int ag71xx_probe(struct platform_device *pdev) ag->stop_desc->next = (u32)ag->stop_desc_dma; mac_addr = of_get_mac_address(np); - if (mac_addr) + if (!IS_ERR(mac_addr)) memcpy(ndev->dev_addr, mac_addr, ETH_ALEN); - if (!mac_addr || !is_valid_ether_addr(ndev->dev_addr)) { + if (IS_ERR(mac_addr) || !is_valid_ether_addr(ndev->dev_addr)) { netif_err(ag, probe, ndev, "invalid MAC address, using random address\n"); eth_random_addr(ndev->dev_addr); } |