From 1cb93009eaff4758900b29a16dffdc3307bd3e1e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 10 Dec 2010 15:41:18 +0300 Subject: [PATCH] --- yaml --- r: 228362 b: refs/heads/master c: e91eb2ff1f713837caebbb86a06974cd4b3e8e46 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6163dd036dfe..4beb7ccabcb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88ab8a8445838785e38af378740ab57f8cb6cb8a +refs/heads/master: e91eb2ff1f713837caebbb86a06974cd4b3e8e46 diff --git a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 12858880f95f..20f8c347cae4 100644 --- a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -509,9 +509,10 @@ void ieee80211_softmac_scan_wq(struct work_struct *work) if (watchdog++ > MAX_CHANNEL_NUMBER) { //if current channel is not in channel map, set to default channel. - if (!channel_map[ieee->current_network.channel]); + if (!channel_map[ieee->current_network.channel]) { ieee->current_network.channel = 6; goto out; /* no good chans */ + } } }while(!channel_map[ieee->current_network.channel]); if (ieee->scanning == 0 )