From: Johannes Berg Date: Fri, 3 May 2013 16:58:16 +0000 (+0200) Subject: iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth X-Git-Tag: v3.11-rc7~11^2~8^2^2~3^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=707aee401d2467baa785a697f40a6e2d9ee79ad5;p=profile%2Fcommon%2Fkernel-common.git 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 Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index 3952ddf..1531a4f 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 */