1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index ae176d8da9e8..595c930b28ae 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -188,9 +188,10 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
                         table = range_0;
         }
 
-        BUG_ON(lvl < 0 || lvl >= IWL_POWER_NUM);
-
-        *cmd = table[lvl].cmd;
+        if (WARN_ON(lvl < 0 || lvl >= IWL_POWER_NUM))
+                memset(cmd, 0, sizeof(*cmd));
+        else
+                *cmd = table[lvl].cmd;
 
         if (period == 0) {
                 skip = 0;
@@ -356,12 +357,10 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,
 
         if (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 &&
-                 priv->cfg->ops->lib->tt_ops.lower_power_detection(priv)) {
+        else if (iwl_tt_is_low_power_state(priv)) {
                 /* in thermal throttling low power state */
                 iwl_static_sleep_cmd(priv, cmd,
-                    priv->cfg->ops->lib->tt_ops.tt_power_mode(priv), dtimper);
+                    iwl_tt_current_power_mode(priv), dtimper);
         } else if (!enabled)
                 iwl_power_sleep_cam_cmd(priv, cmd);
         else if (priv->power_data.debug_sleep_level_override >= 0)