Skip to content

Commit 1eddf75

Browse files
nehebSasha Levin
authored andcommitted
wifi: ath9k: return by of_get_mac_address
[ Upstream commit dfffb31 ] 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 <[email protected]> Acked-by: Toke Høiland-Jørgensen <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jeff Johnson <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 71ab2f1 commit 1eddf75

File tree

1 file changed

+3
-1
lines changed
  • drivers/net/wireless/ath/ath9k

1 file changed

+3
-1
lines changed

drivers/net/wireless/ath/ath9k/init.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,9 @@ static int ath9k_of_init(struct ath_softc *sc)
691691
ah->ah_flags |= AH_NO_EEP_SWAP;
692692
}
693693

694-
of_get_mac_address(np, common->macaddr);
694+
ret = of_get_mac_address(np, common->macaddr);
695+
if (ret == -EPROBE_DEFER)
696+
return ret;
695697

696698
return 0;
697699
}

0 commit comments

Comments
 (0)