提交 6ddbf8cd 编写于 作者: W Wey-Yi Guy 提交者: John W. Linville

iwlwifi: fix thermal throttling related power management operation

The current approach is very broken because it adds an
often-used code path that will not initialise "cmd" at all.
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
Signed-off-by: Shanyu Zhao <shanyu.zhao.intel.com>
Signed-off-by: NWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 2b2d7795
...@@ -284,13 +284,11 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force) ...@@ -284,13 +284,11 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force)
priv->hw->conf.flags & IEEE80211_CONF_IDLE) priv->hw->conf.flags & IEEE80211_CONF_IDLE)
iwl_static_sleep_cmd(priv, &cmd, IWL_POWER_INDEX_5, 20); iwl_static_sleep_cmd(priv, &cmd, IWL_POWER_INDEX_5, 20);
else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && else if (priv->cfg->ops->lib->tt_ops.lower_power_detection &&
priv->cfg->ops->lib->tt_ops.tt_power_mode) { priv->cfg->ops->lib->tt_ops.tt_power_mode &&
if (priv->cfg->ops->lib->tt_ops.lower_power_detection(priv)) { priv->cfg->ops->lib->tt_ops.lower_power_detection(priv)) {
/* in thermal throttling low power state */ /* in thermal throttling low power state */
iwl_static_sleep_cmd(priv, &cmd, iwl_static_sleep_cmd(priv, &cmd,
priv->cfg->ops->lib->tt_ops.tt_power_mode(priv), priv->cfg->ops->lib->tt_ops.tt_power_mode(priv), dtimper);
dtimper);
}
} else if (!enabled) } else if (!enabled)
iwl_power_sleep_cam_cmd(priv, &cmd); iwl_power_sleep_cam_cmd(priv, &cmd);
else if (priv->power_data.debug_sleep_level_override >= 0) else if (priv->power_data.debug_sleep_level_override >= 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册