diff options
| author | Pontus Fuchs <pontus.fuchs@gmail.com> | 2012-01-11 14:22:42 +0100 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-02-15 07:38:28 +0100 |
| commit | 9e0dc890ce23e2b28ce906bb8f466ca66f420911 (patch) | |
| tree | a3099c0de023bd1d17121e8733829594947459ac | |
| parent | wl12xx: enable sparse endianess check by default (diff) | |
| download | linux-9e0dc890ce23e2b28ce906bb8f466ca66f420911.tar.xz linux-9e0dc890ce23e2b28ce906bb8f466ca66f420911.zip | |
wl12xx: Make sure HW is available in sched scan ops
The sched_scan_(stop|start) ops fails to check for WL1271_STATE_OFF.
This can lead to a race where the driver tries to access the HW
while it's off.
Fix this by checking for WL1271_STATE_OFF before accessing the HW.
Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index f8748cedbae1..f2a958c9537a 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -3108,6 +3108,11 @@ static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw, mutex_lock(&wl->mutex); + if (wl->state == WL1271_STATE_OFF) { + ret = -EAGAIN; + goto out; + } + ret = wl1271_ps_elp_wakeup(wl); if (ret < 0) goto out; @@ -3139,6 +3144,9 @@ static void wl1271_op_sched_scan_stop(struct ieee80211_hw *hw, mutex_lock(&wl->mutex); + if (wl->state == WL1271_STATE_OFF) + goto out; + ret = wl1271_ps_elp_wakeup(wl); if (ret < 0) goto out; |