[PATCH] wl12xx: Make sure HW is available in sched scan ops

[PATCH] wl12xx: Make sure HW is available in sched scan ops

[Pontus Fuchs]

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>
---
 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 d5f55a1..915d56c 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3105,6 +3105,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;
@@ -3136,6 +3141,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;
-- 
1.7.5.4

Re: [PATCH] wl12xx: Make sure HW is available in sched scan ops

[Luciano Coelho]

On Wed, 2012-01-11 at 14:22 +0100, Pontus Fuchs wrote: 
> 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>
> ---

Applied, thanks!

-- 
Cheers,
Luca.