diff options
author | 2013-04-14 18:37:05 -0700 | |
---|---|---|
committer | 2013-04-14 18:37:05 -0700 | |
commit | 0d1d392f011b284bb4af0411b2d36e5d04e0f058 (patch) | |
tree | 081f99182bde3cc8af49b80b4e9df7d95476e8ed /drivers/net/wireless/ath/ath9k/main.c | |
parent | PM / Runtime: Idle devices asynchronously after probe|release (diff) | |
parent | Linux 3.9-rc7 (diff) | |
download | linux-dev-0d1d392f011b284bb4af0411b2d36e5d04e0f058.tar.xz linux-dev-0d1d392f011b284bb4af0411b2d36e5d04e0f058.zip |
Merge 3.9-rc7 into driver-core-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 6e66f9c6782b..988372d218a4 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/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; } |