From 2c32e63f014001c6e893dee3eb4c970c9f1d75ff Mon Sep 17 00:00:00 2001
From: Bob Copeland <me@bobcopeland.com>
Date: Sat, 4 Jul 2009 21:03:13 -0400
Subject: [PATCH] --- yaml --- r: 158941 b: refs/heads/master c:
 3355443ad7601991affa5992b0d53870335af765 h: refs/heads/master i:   158939:
 f286657f306c7b19104ca8e5eae0996fb954133d v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath5k/base.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d46f444cbcbc..f0a7440d82b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d0cd72fa1e6bfd419c99478ec70b4877ed0ef86
+refs/heads/master: 3355443ad7601991affa5992b0d53870335af765
diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.c b/trunk/drivers/net/wireless/ath/ath5k/base.c
index 3f55e90c43fc..20ba6fa5f1f1 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/base.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/base.c
@@ -2687,7 +2687,7 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan)
 		sc->curchan = chan;
 		sc->curband = &sc->sbands[chan->band];
 	}
-	ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, true);
+	ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, chan != NULL);
 	if (ret) {
 		ATH5K_ERR(sc, "can't reset hardware (%d)\n", ret);
 		goto err;