From 4da3f689440e40d9cf8c5cf9fe2eb0e6ad33fa6c Mon Sep 17 00:00:00 2001 From: Ido Yariv Date: Wed, 11 Jan 2012 09:42:40 +0200 Subject: [PATCH] --- yaml --- r: 290561 b: refs/heads/master c: a454969ede024a209e6a755d5f7a928ab81ed00c h: refs/heads/master i: 290559: fb5cd08d0a81d3f00e7f4621708ee20bdbf2d509 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97147bd3adfe..690c06f8d52a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3df1331f25f782e838a3ecb72cec86b539ac02f +refs/heads/master: a454969ede024a209e6a755d5f7a928ab81ed00c diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index ac6866469073..9e9fb3fb8f01 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -1406,8 +1406,6 @@ int wl1271_plt_stop(struct wl1271 *wl) goto out; } - wl1271_power_off(wl); - wl->state = WL1271_STATE_OFF; wl->rx_counter = 0; @@ -1417,6 +1415,11 @@ int wl1271_plt_stop(struct wl1271 *wl) wl1271_flush_deferred_work(wl); cancel_work_sync(&wl->netstack_work); cancel_work_sync(&wl->recovery_work); + + mutex_lock(&wl->mutex); + wl1271_power_off(wl); + mutex_unlock(&wl->mutex); + out: return ret; }