diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 1eec18d909d..1d1bf3234d8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
@@ -226,8 +226,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, | |||
226 | else | 226 | else |
227 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; | 227 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; |
228 | 228 | ||
229 | if (priv->cfg->bt_params && | 229 | if (iwl_advanced_bt_coexist(priv)) { |
230 | priv->cfg->bt_params->advanced_bt_coexist) { | ||
231 | if (!priv->cfg->bt_params->bt_sco_disable) | 230 | if (!priv->cfg->bt_params->bt_sco_disable) |
232 | cmd->flags |= IWL_POWER_BT_SCO_ENA; | 231 | cmd->flags |= IWL_POWER_BT_SCO_ENA; |
233 | else | 232 | else |
@@ -313,8 +312,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv, | |||
313 | else | 312 | else |
314 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; | 313 | cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; |
315 | 314 | ||
316 | if (priv->cfg->bt_params && | 315 | if (iwl_advanced_bt_coexist(priv)) { |
317 | priv->cfg->bt_params->advanced_bt_coexist) { | ||
318 | if (!priv->cfg->bt_params->bt_sco_disable) | 316 | if (!priv->cfg->bt_params->bt_sco_disable) |
319 | cmd->flags |= IWL_POWER_BT_SCO_ENA; | 317 | cmd->flags |= IWL_POWER_BT_SCO_ENA; |
320 | else | 318 | else |
@@ -358,8 +356,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, | |||
358 | 356 | ||
359 | if (priv->cfg->base_params->broken_powersave) | 357 | if (priv->cfg->base_params->broken_powersave) |
360 | iwl_power_sleep_cam_cmd(priv, cmd); | 358 | iwl_power_sleep_cam_cmd(priv, cmd); |
361 | else if (priv->cfg->base_params->supports_idle && | 359 | else if (priv->hw->conf.flags & IEEE80211_CONF_IDLE) |
362 | priv->hw->conf.flags & IEEE80211_CONF_IDLE) | ||
363 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); | 360 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); |
364 | else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && | 361 | else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && |
365 | priv->cfg->ops->lib->tt_ops.tt_power_mode && | 362 | priv->cfg->ops->lib->tt_ops.tt_power_mode && |