Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ddbf8cd authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: Shanyu Zhao <shanyu.zhao.intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2b2d7795

drivers/net/wireless/iwlwifi/iwl-power.c

+5 −7
Original line number Diff line number Diff line
@@ -284,13 +284,11 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force) 
		 priv->hw->conf.flags & IEEE80211_CONF_IDLE)

		iwl_static_sleep_cmd(priv, &cmd, IWL_POWER_INDEX_5, 20);

	else if (priv->cfg->ops->lib->tt_ops.lower_power_detection &&

		 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.tt_power_mode &&

		 priv->cfg->ops->lib->tt_ops.lower_power_detection(priv)) {

		/* in thermal throttling low power state */

		iwl_static_sleep_cmd(priv, &cmd,

			    priv->cfg->ops->lib->tt_ops.tt_power_mode(priv),

			    dtimper);

		}

		    priv->cfg->ops->lib->tt_ops.tt_power_mode(priv), dtimper);

	} else if (!enabled)

		iwl_power_sleep_cam_cmd(priv, &cmd);

	else if (priv->power_data.debug_sleep_level_override >= 0)