summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLuis de Bethencourt <luisbg@osg.samsung.com>2015-10-17 11:39:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-24 18:33:17 -0700
commit4b6a8799f341820e7327fb534f130c7f82fb6356 (patch)
tree761361d8d35c71e88072e5e3342e287dd27c4d54 /drivers
parent1ff0c8a97d3ec26ed3c7a26a74851a4b0fb515e3 (diff)
downloadlinux-stable-4b6a8799f341820e7327fb534f130c7f82fb6356.tar.gz
linux-stable-4b6a8799f341820e7327fb534f130c7f82fb6356.tar.bz2
linux-stable-4b6a8799f341820e7327fb534f130c7f82fb6356.zip
staging: rtl8192u: simplify conditional
The code can be much cleaner and readable by simplifying the conditional statement. Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index fcbd59f9d6e9..c57fb220a129 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -466,13 +466,9 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
/* this prevent excessive time wait when we
* need to wait for a syncro scan to end..
*/
- if(ieee->state < IEEE80211_LINKED)
- ;
- else
- if (ieee->sync_scan_hurryup)
+ if (ieee->state >= IEEE80211_LINKED && ieee->sync_scan_hurryup)
goto out;
-
msleep_interruptible_rsl(IEEE80211_SOFTMAC_SCAN_TIME);
}