From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Mon, 3 Aug 2009 19:24:38 +0000 (-0700)
Subject: ath9k: move cache setting of softc ah prior to attach
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e1e2f93ffacab692823209e00a124e802039aa9a;p=deliverable%2Flinux.git

ath9k: move cache setting of softc ah prior to attach

We do this in case attach and friends try to get back to
ah from the softc somehow.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index fa2c230c3c2f..605d3280733a 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1332,6 +1332,7 @@ static int ath_init(u16 devid, struct ath_softc *sc)
 
 	ah->ah_sc = sc;
 	ah->hw_version.devid = devid;
+	sc->sc_ah = ah;
 
 	r = ath9k_hw_attach(ah, sc);
 	if (r) {
@@ -1340,7 +1341,6 @@ static int ath_init(u16 devid, struct ath_softc *sc)
 			"initialization status: %d\n", r);
 		goto bad;
 	}
-	sc->sc_ah = ah;
 
 	/* Get the hardware key cache size. */
 	sc->keymax = ah->caps.keycache_size;