From b8f4955108f9f6a5f7f95ce52f18225c1f238c48 Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Fri, 21 Jan 2011 12:19:52 +0900
Subject: [PATCH] --- yaml --- r: 236770 b: refs/heads/master c:
 2b1351a30705925ed06b41ec98a6fbaad4ba4d6f h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath5k/base.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bfdfe558bfd0..b88df250153b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7e86c3219a1287dd1350a590ee79c8753ff2420
+refs/heads/master: 2b1351a30705925ed06b41ec98a6fbaad4ba4d6f
diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.c b/trunk/drivers/net/wireless/ath/ath5k/base.c
index 217c2a09d979..76a4e55265c3 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/base.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/base.c
@@ -267,7 +267,7 @@ ath5k_setup_channels(struct ath5k_hw *ah,
 		unsigned int mode,
 		unsigned int max)
 {
-	unsigned int i, count, size, chfreq, freq, ch;
+	unsigned int count, size, chfreq, freq, ch;
 	enum ieee80211_band band;
 
 	if (!test_bit(mode, ah->ah_modes))
@@ -291,8 +291,8 @@ ath5k_setup_channels(struct ath5k_hw *ah,
 		return 0;
 	}
 
-	for (i = 0, count = 0; i < size && max > 0; i++) {
-		ch = i + 1 ;
+	count = 0;
+	for (ch = 1; ch <= size && count < max; ch++) {
 		freq = ieee80211_channel_to_frequency(ch, band);
 
 		if (freq == 0) /* mapping failed - not a standard channel */
@@ -319,7 +319,6 @@ ath5k_setup_channels(struct ath5k_hw *ah,
 		}
 
 		count++;
-		max--;
 	}
 
 	return count;