summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2026-02-24 04:46:06 +0300
committerJakub Kicinski <kuba@kernel.org>2026-02-26 06:01:24 +0300
commitdc2a1facbde80b388d5052c572577d74eb4da69f (patch)
tree090b0afdb977b8312a7ea5a50e66e6ae9aa448dd
parent6698d6ce6a6b20d8780ade93b9b689787b5a4945 (diff)
downloadlinux-dc2a1facbde80b388d5052c572577d74eb4da69f.tar.xz
net: fs_enet: allow nvmem to override MAC address
NVMEM typically loads after the ethernet driver and of_get_ethdev_address returns -EPROBE_DEFER. return in such a case to allow NVMEM to work. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://patch.msgid.link/20260224014607.353378-1-rosenp@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index f563692a4a00..194edf3c43c1 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -951,7 +951,9 @@ static int fs_enet_probe(struct platform_device *ofdev)
spin_lock_init(&fep->lock);
spin_lock_init(&fep->tx_lock);
- of_get_ethdev_address(ofdev->dev.of_node, ndev);
+ ret = of_get_ethdev_address(ofdev->dev.of_node, ndev);
+ if (ret == -EPROBE_DEFER)
+ goto out_cleanup_data;
ret = fep->ops->allocate_bd(ndev);
if (ret)