Skip to content

Commit b2d9544

Browse files
nehebkuba-moo
authored andcommitted
net: gianfar: fix NVMEM mac address
If nvmem loads after the ethernet driver, mac address assignments will not take effect. of_get_ethdev_address returns EPROBE_DEFER in such a case so we need to handle that to avoid eth_hw_addr_random. Signed-off-by: Rosen Penev <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent cf06766 commit b2d9544

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/net/ethernet/freescale/gianfar.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
754754
priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING;
755755

756756
err = of_get_ethdev_address(np, dev);
757+
if (err == -EPROBE_DEFER)
758+
goto err_grp_init;
757759
if (err) {
758760
eth_hw_addr_random(dev);
759761
dev_info(&ofdev->dev, "Using random MAC address: %pM\n", dev->dev_addr);

0 commit comments

Comments
 (0)