From 68a2cd6ffa6399d9cbcf029e9539aef2d07d31b3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 3 Nov 2008 11:27:38 +0100 Subject: [PATCH] --- yaml --- r: 121999 b: refs/heads/master c: 8b0162a3dc5c30e862b7a73da29e32de3170f5e4 h: refs/heads/master i: 121997: c28e90402c60fe10de4a99f4bd3e0c94607367d1 121995: 613647d9b29723c572bbba27d43e2911bbb1bb14 121991: aef40ec8fa2d41bb23216edda0029af352fea11f 121983: 52baa544882154647a13f0510d2d893c4cf11b7f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath5k/phy.c | 4 +--- trunk/drivers/net/wireless/ath5k/reset.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 73f5028182ca..c3adaa1bd97c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d64360ac56cda95243f15738a06f2a123c663e5 +refs/heads/master: 8b0162a3dc5c30e862b7a73da29e32de3170f5e4 diff --git a/trunk/drivers/net/wireless/ath5k/phy.c b/trunk/drivers/net/wireless/ath5k/phy.c index 69625bf4d11c..7ba18e09463b 100644 --- a/trunk/drivers/net/wireless/ath5k/phy.c +++ b/trunk/drivers/net/wireless/ath5k/phy.c @@ -2196,9 +2196,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah, return ret; } - ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq); - if (ret) - return ret; + ath5k_hw_noise_floor_calibration(ah, channel->center_freq); /* * Re-enable RX/TX and beacons diff --git a/trunk/drivers/net/wireless/ath5k/reset.c b/trunk/drivers/net/wireless/ath5k/reset.c index b51bc030da02..5003263c9ea4 100644 --- a/trunk/drivers/net/wireless/ath5k/reset.c +++ b/trunk/drivers/net/wireless/ath5k/reset.c @@ -842,9 +842,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode, * * XXX: Find an interval that's OK for all cards... */ - ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq); - if (ret) - return ret; + ath5k_hw_noise_floor_calibration(ah, channel->center_freq); /* * Reset queues and start beacon timers at the end of the reset routine