summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2024-11-05 14:23:26 -0800
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>2025-01-29 08:56:33 -0800
commitdfffb317519f88534bb82797f055f0a2fd867e7b (patch)
treeb1a863407f2cb3bd160a609851dd1dabf475a324
parent24f587572acf7509127dbdfcbf1b681ef84eeba0 (diff)
downloadlinux-dfffb317519f88534bb82797f055f0a2fd867e7b.tar.gz
linux-dfffb317519f88534bb82797f055f0a2fd867e7b.tar.bz2
linux-dfffb317519f88534bb82797f055f0a2fd867e7b.zip
wifi: ath9k: return by of_get_mac_address
When using nvmem, ath9k could potentially be loaded before nvmem, which loads after mtd. This is an issue if DT contains an nvmem mac address. If nvmem is not ready in time for ath9k, -EPROBE_DEFER is returned. Pass it to _probe so that ath9k can properly grab a potentially present MAC address. Signed-off-by: Rosen Penev <rosenp@gmail.com> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> Link: https://patch.msgid.link/20241105222326.194417-1-rosenp@gmail.com Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index f9e77c4624d9..01e0dffbf57e 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -647,7 +647,9 @@ static int ath9k_of_init(struct ath_softc *sc)
ah->ah_flags |= AH_NO_EEP_SWAP;
}
- of_get_mac_address(np, common->macaddr);
+ ret = of_get_mac_address(np, common->macaddr);
+ if (ret == -EPROBE_DEFER)
+ return ret;
return 0;
}