diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/net/wireless/ath5k | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/net/wireless/ath5k')
| -rw-r--r-- | drivers/net/wireless/ath5k/hw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c index 677600b302d9..ff579a223621 100644 --- a/drivers/net/wireless/ath5k/hw.c +++ b/drivers/net/wireless/ath5k/hw.c | |||
| @@ -458,6 +458,8 @@ void ath5k_hw_detach(struct ath5k_hw *ah) | |||
| 458 | { | 458 | { |
| 459 | ATH5K_TRACE(ah->ah_sc); | 459 | ATH5K_TRACE(ah->ah_sc); |
| 460 | 460 | ||
| 461 | __set_bit(ATH_STAT_INVALID, ah->ah_sc->status); | ||
| 462 | |||
| 461 | if (ah->ah_rf_banks != NULL) | 463 | if (ah->ah_rf_banks != NULL) |
| 462 | kfree(ah->ah_rf_banks); | 464 | kfree(ah->ah_rf_banks); |
| 463 | 465 | ||