diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath5k/phy.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/ath5k/reset.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c index 69625bf4d11c..7ba18e09463b 100644 --- a/drivers/net/wireless/ath5k/phy.c +++ b/drivers/net/wireless/ath5k/phy.c | |||
| @@ -2196,9 +2196,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah, | |||
| 2196 | return ret; | 2196 | return ret; |
| 2197 | } | 2197 | } |
| 2198 | 2198 | ||
| 2199 | ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq); | 2199 | ath5k_hw_noise_floor_calibration(ah, channel->center_freq); |
| 2200 | if (ret) | ||
| 2201 | return ret; | ||
| 2202 | 2200 | ||
| 2203 | /* | 2201 | /* |
| 2204 | * Re-enable RX/TX and beacons | 2202 | * Re-enable RX/TX and beacons |
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 |