49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
|
Bugzilla: 1046495
|
||
|
|
Upstream-status: Sent for 3.14 http://marc.info/?l=linux-wireless&m=139453882510796&w=2
|
||
|
|
|
||
|
|
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
||
|
|
|
||
|
|
There is a flow in which we send the host command in SYNC
|
||
|
|
mode, but we don't take priv->mutex.
|
||
|
|
|
||
|
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1046495
|
||
|
|
|
||
|
|
Cc: <stable@vger.kernel.org>
|
||
|
|
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
|
||
|
|
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/iwlwifi/dvm/main.c | 8 ++++++--
|
||
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
|
||
|
|
index ba1b1ea..ea7e70c 100644
|
||
|
|
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
|
||
|
|
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
|
||
|
|
@@ -252,13 +252,17 @@ static void iwl_bg_bt_runtime_config(struct work_struct *work)
|
||
|
|
struct iwl_priv *priv =
|
||
|
|
container_of(work, struct iwl_priv, bt_runtime_config);
|
||
|
|
|
||
|
|
+ mutex_lock(&priv->mutex);
|
||
|
|
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
|
||
|
|
- return;
|
||
|
|
+ goto out;
|
||
|
|
|
||
|
|
/* dont send host command if rf-kill is on */
|
||
|
|
if (!iwl_is_ready_rf(priv))
|
||
|
|
- return;
|
||
|
|
+ goto out;
|
||
|
|
+
|
||
|
|
iwlagn_send_advance_bt_config(priv);
|
||
|
|
+out:
|
||
|
|
+ mutex_unlock(&priv->mutex);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void iwl_bg_bt_full_concurrency(struct work_struct *work)
|
||
|
|
--
|
||
|
|
1.8.3.2
|
||
|
|
|
||
|
|
--
|
||
|
|
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
|
||
|
|
the body of a message to majordomo@vger.kernel.org
|
||
|
|
More majordomo info at http://vger.kernel.org/majordomo-info.html
|