From dd86700402c9d50c6b0731086eed62cb6bcdd5f3 Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Wed, 23 Feb 2011 12:48:52 +0100 Subject: [PATCH] --- yaml --- r: 236097 b: refs/heads/master c: e34870f828f8d9b7e2205c632cbc135a76f7dde6 h: refs/heads/master i: 236095: f1cfe5969613aa021d37bbda727384308e109607 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d68c55c1751b..79013479a70c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55182a10063c40eda4dc5afecff712e5c3617ffc +refs/heads/master: e34870f828f8d9b7e2205c632cbc135a76f7dde6 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 3109e3da31d1..791329cbc8a6 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c @@ -171,9 +171,7 @@ static int wl_ops_start(struct ieee80211_hw *hw) WL_NONE("%s : Initial channel: %d\n", __func__, curchan->hw_value); */ - WL_LOCK(wl); ieee80211_wake_queues(hw); - WL_UNLOCK(wl); blocked = wl_rfkill_set_hw_state(wl); if (!blocked) wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy); @@ -185,9 +183,8 @@ static void wl_ops_stop(struct ieee80211_hw *hw) { struct wl_info *wl = hw->priv; ASSERT(wl); - WL_LOCK(wl); ieee80211_stop_queues(hw); - WL_UNLOCK(wl); + return; } static int @@ -1988,8 +1985,10 @@ bool wl_rfkill_set_hw_state(struct wl_info *wl) WL_NONE("%s: update hw state: blocked=%s\n", __func__, blocked ? "true" : "false"); + WL_UNLOCK(wl); wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, blocked); if (blocked) wiphy_rfkill_start_polling(wl->pub->ieee_hw->wiphy); + WL_LOCK(wl); return blocked; }