---

yaml --- r: 362402 b: refs/heads/master c: f50b1cd h: refs/heads/master v: v3
git-mirror · Apr 3, 2013 · 0c21299 · 0c21299
1 parent 2cf9502
commit 0c21299
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eaa956c5b18b9c955ae5a4e6e6909cae23f38e0
+refs/heads/master: f50b1cd37446ad32c432f0f73bbed67a1c076eae
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -280,6 +280,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan)
 	if (r) {
 		ath_err(common,
 			"Unable to reset channel, reset status %d\n", r);
+
+		ath9k_hw_enable_interrupts(ah);
+		ath9k_queue_reset(sc, RESET_TYPE_BB_HANG);
+
 		goto out;
 	}