Skip to contentSkip to conversation

wifi: brcmfmac: of: defer probe for MAC address

PATCH In review Rosen Penev 2 participants 2 messages Feb 20 – Mar 28 Broadcom BRCM80211 IEEE802.11 wireless drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: brcmfmac: of: defer probe for MAC address

of_get_mac_address can return EPROBE_DEFER if the specific nvmem driver has not been loaded yet.

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c +3 -1
index 1681ad00f82e..03efae36a0b2 100644
@@ -128,7 +128,9 @@ int brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
 	if (err)
 		brcmf_err("failed to get OF country code map (err=%d)\n", err);
 
-	of_get_mac_address(np, settings->mac);
+	err = of_get_mac_address(np, settings->mac);
+	if (err == -EPROBE_DEFER)
+		return err;
 
 	if (bus_type != BRCMF_BUSTYPE_SDIO)
 		return 0;

--
2.53.0

maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · Rosen Penev

of_get_mac_address can return EPROBE_DEFER if the specific nvmem driver has not been loaded yet.

We already catch the -EPROBE_DEFER calling brcm_of_probe() so looks good to me.

Quoted 4 lines
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)