summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-03 18:58:16 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-07-16 13:55:05 +0300
commit707aee401d2467baa785a697f40a6e2d9ee79ad5 (patch)
tree4607da11fe8355ca1f9a28e40eed860ba7ce4012
parentb7327d89ae694a89f9934d428bde520b77b3131c (diff)
downloadlinux-707aee401d2467baa785a697f40a6e2d9ee79ad5.tar.gz
linux-707aee401d2467baa785a697f40a6e2d9ee79ad5.tar.bz2
linux-707aee401d2467baa785a697f40a6e2d9ee79ad5.zip
iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth
The BT_CONFIG command that is sent to the device during startup will enable BT coex unless the module parameter turns it off, but on devices without Bluetooth this may cause problems, as reported in Redhat BZ 885407. Fix this by sending the BT_CONFIG command only when the device has Bluetooth. Cc: stable@vger.kernel.org Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index 3952ddf2ddb2..1531a4fc0960 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -758,7 +758,7 @@ int iwl_alive_start(struct iwl_priv *priv)
BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
if (ret)
return ret;
- } else {
+ } else if (priv->lib->bt_params) {
/*
* default is 2-wire BT coexexistence support
*/