diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-21 20:05:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-21 20:05:11 -0500 |
| commit | 6c0bce37ffc8f000a516fadf6dee84579c4c8f9b (patch) | |
| tree | 273af34d6f777b1ecb0fce7b2685e868064e6cf9 /drivers/net/wireless/ath5k/reset.c | |
| parent | e243455d345ef62751723671bc2605a2f6032ceb (diff) | |
| parent | a1eb5fe319beb9e181aa52c8adf75ad9aab56a89 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath5k/reset.c')
| -rw-r--r-- | drivers/net/wireless/ath5k/reset.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c index b51bc030da02..5003263c9ea4 100644 --- a/drivers/net/wireless/ath5k/reset.c +++ b/drivers/net/wireless/ath5k/reset.c | |||
| @@ -842,9 +842,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, | |||
| 842 | * | 842 | * |
| 843 | * XXX: Find an interval that's OK for all cards... | 843 | * XXX: Find an interval that's OK for all cards... |
| 844 | */ | 844 | */ |
| 845 | ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq); | 845 | ath5k_hw_noise_floor_calibration(ah, channel->center_freq); |
| 846 | if (ret) | ||
| 847 | return ret; | ||
| 848 | 846 | ||
| 849 | /* | 847 | /* |
| 850 | * Reset queues and start beacon timers at the end of the reset routine | 848 | * Reset queues and start beacon timers at the end of the reset routine |