]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
kernel: bcma: fallback-sprom: check defered probe
authorRosen Penev <rosenp@gmail.com>
Sat, 28 Feb 2026 19:51:58 +0000 (11:51 -0800)
committerChristian Marangi <ansuelsmth@gmail.com>
Tue, 10 Mar 2026 12:35:31 +0000 (13:35 +0100)
When NVMEM is not ready, of_get_mac_address fails. Handle this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22305
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
target/linux/generic/files/drivers/bcma/fallback-sprom.c

index 6932c3c8f574beeeb0d0213b6f01cec39f64eb6b..4c361cc000ee0cd5d0d7d7efc8fef385ba80d49e 100644 (file)
@@ -479,6 +479,7 @@ static int bcma_fbs_probe(struct platform_device *pdev)
        struct bcma_fbs *priv;
        unsigned long flags;
        u8 mac[ETH_ALEN];
+       int ret;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -491,7 +492,10 @@ static int bcma_fbs_probe(struct platform_device *pdev)
        of_property_read_u32(node, "pci-bus", &priv->pci_bus);
        of_property_read_u32(node, "pci-dev", &priv->pci_dev);
 
-       of_get_mac_address(node, mac);
+       ret = of_get_mac_address(node, mac);
+       if (ret == -EPROBE_DEFER)
+               return ret;
+
        if (is_valid_ether_addr(mac)) {
                dev_info(dev, "mtd mac %pM\n", mac);
        } else {