diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2025-03-07 11:17:59 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2025-03-07 11:19:03 +0300 |
| commit | 0e28ee106c46c95eb322833c17c33e3c231ccd0d (patch) | |
| tree | 44ebe9a19172fab2b02e7e6fe63cc70dd77491f1 /drivers/net/wireless/ath/ath9k/init.c | |
| parent | d1e879ec600f9b3bdd253167533959facfefb17b (diff) | |
| parent | 9a0dddfb30f120db3851627935851d262e4e7acb (diff) | |
| download | linux-0e28ee106c46c95eb322833c17c33e3c231ccd0d.tar.xz | |
Merge tag 'ath-next-20250305' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath
Jeff Johnson says:
====================
ath.git patches for v6.15
This development cycle again featured multiple patchsets to ath12k to
support the new 802.11be MLO feature. In addition, there was the usual
set of bug fixes and cleanups.
====================
Link: https://lore.kernel.org/linux-wireless/d01b1976-ebe8-48cd-8f49-32bfa00bed7e@oss.qualcomm.com/
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 4 |
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; } |