]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: ath9k: return by of_get_mac_address
authorRosen Penev <rosenp@gmail.com>
Tue, 5 Nov 2024 22:23:26 +0000 (14:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Jun 2025 12:38:04 +0000 (14:38 +0200)
[ Upstream commit dfffb317519f88534bb82797f055f0a2fd867e7b ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ath/ath9k/init.c

index e9a36dd7144f1f65e708fab910c381ad7099142e..bbc9d570c4e3da08775d914ebf6b5a072a3841ea 100644 (file)
@@ -639,7 +639,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;
 }