From 0c21299b3c6f2c3571013eb0eb9581382e0762fb Mon Sep 17 00:00:00 2001
From: Robert Shade <robert.shade@gmail.com>
Date: Tue, 2 Apr 2013 19:52:45 -0400
Subject: [PATCH] --- yaml --- r: 362402 b: refs/heads/master c:
 f50b1cd37446ad32c432f0f73bbed67a1c076eae h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7526cde2d9e0..d6ddd2d80636 100644
--- 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
index 6e66f9c6782b..988372d218a4 100644
--- 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;
 	}