diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-02 12:45:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-02 12:45:44 -0700 |
| commit | 7162f6691e9d39d8d866574687cddb3f1ec65d72 (patch) | |
| tree | c511679caf5c825ede4728870c513f92f4f1616b /drivers/net/wireless/wl12xx/wl1271_main.c | |
| parent | 250e061e1d3e26600236a3dd9172e7f5f5916c00 (diff) | |
| parent | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 30194c0f36a9..8e55cf8d509d 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c @@ -948,9 +948,7 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, ieee80211_enable_dyn_ps(wl->vif); if (wl->scan.state != WL1271_SCAN_STATE_IDLE) { - mutex_unlock(&wl->mutex); ieee80211_scan_completed(wl->hw, true); - mutex_lock(&wl->mutex); wl->scan.state = WL1271_SCAN_STATE_IDLE; kfree(wl->scan.scanned_ch); wl->scan.scanned_ch = NULL; |