Commit 2bf4ecbc authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller

net: macb: do not copy the mac address if NULL

This patch fixes the MAC address setup in the probe. The MAC address
retrieved using of_get_mac_address was checked for not containing an
error, but it may also be NULL which wasn't tested. Fix it by replacing
IS_ERR with IS_ERR_OR_NULL.

Fixes: 541ddc66 ("net: macb: support of_get_mac_address new ERR_PTR error")
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55655e3d
...@@ -4180,7 +4180,7 @@ static int macb_probe(struct platform_device *pdev) ...@@ -4180,7 +4180,7 @@ static int macb_probe(struct platform_device *pdev)
if (PTR_ERR(mac) == -EPROBE_DEFER) { if (PTR_ERR(mac) == -EPROBE_DEFER) {
err = -EPROBE_DEFER; err = -EPROBE_DEFER;
goto err_out_free_netdev; goto err_out_free_netdev;
} else if (!IS_ERR(mac)) { } else if (!IS_ERR_OR_NULL(mac)) {
ether_addr_copy(bp->dev->dev_addr, mac); ether_addr_copy(bp->dev->dev_addr, mac);
} else { } else {
macb_get_hwaddr(bp); macb_get_hwaddr(bp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment