]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: fs_enet: allow nvmem to override MAC address
authorRosen Penev <rosenp@gmail.com>
Tue, 24 Feb 2026 01:46:06 +0000 (17:46 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 26 Feb 2026 03:01:24 +0000 (19:01 -0800)
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>
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

index f563692a4a00c44ac2ca823548aad05ea1c97300..194edf3c43c1a90f0b64927a6f0296d39802a450 100644 (file)
@@ -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)