summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-03 18:58:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-11 18:35:26 -0700
commit28f7544b8ba92b3975daa5b639ceb14ea2989d48 (patch)
tree9ff667f54a3c27e1425bb520829d3183acbcb363
parentf0f5bc74eab416cea936f669e90a9d8a8dff18fd (diff)
downloadlinux-3.10-28f7544b8ba92b3975daa5b639ceb14ea2989d48.tar.gz
linux-3.10-28f7544b8ba92b3975daa5b639ceb14ea2989d48.tar.bz2
linux-3.10-28f7544b8ba92b3975daa5b639ceb14ea2989d48.zip
iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth
commit 707aee401d2467baa785a697f40a6e2d9ee79ad5 upstream. 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. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 74d7572e709..a8afc7bee54 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->cfg->bt_params) {
/*
* default is 2-wire BT coexexistence support
*/