diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-03-10 14:22:03 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-03-11 12:15:16 +0100 |
| commit | 82e5a649453a3cf23516277abb84273768a1592b (patch) | |
| tree | 139304ff7a095ae8c5df55fa04fdc16c9a9321be | |
| parent | iwlwifi: fix and add 7265 series HW IDs (diff) | |
| download | linux-82e5a649453a3cf23516277abb84273768a1592b.tar.xz linux-82e5a649453a3cf23516277abb84273768a1592b.zip | |
iwlwifi: dvm: take mutex when sending SYNC BT config command
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>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index ba1b1ea54252..ea7e70cb34f0 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) |