diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-14 14:33:19 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-14 14:33:19 -0400 |
| commit | 3e3cb6caea8a86cebfafed349184c125d563cbc1 (patch) | |
| tree | 3c0100030687c63e6c31a49b1aa4c8fec35f45bf /drivers/net/wireless/iwlwifi/dvm | |
| parent | 1698aca04085a98e0e22256c0a7f0e686d982084 (diff) | |
| parent | 82e5a649453a3cf23516277abb84273768a1592b (diff) | |
| download | op-kernel-dev-3e3cb6caea8a86cebfafed349184c125d563cbc1.zip op-kernel-dev-3e3cb6caea8a86cebfafed349184c125d563cbc1.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
| -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 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) |
