---

yaml --- r: 195215 b: refs/heads/master c: 3a065ab h: refs/heads/master i: 195213: e83e183 195211: 3683c37 195207: b76f8e6 195199: bf46c74 v: v3
git-mirror · May 10, 2010 · 344abc5 · 344abc5
1 parent 5d7d169
commit 344abc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 832f47e333c7d0db632b57e9f07956ae40dd481d
+refs/heads/master: 3a065ab3b57bedefa1d59c88f731da6513ac482a
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-power.c b/trunk/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -317,10 +317,7 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force)
 	update_chains = priv->chain_noise_data.state == IWL_CHAIN_NOISE_DONE ||
 			priv->chain_noise_data.state == IWL_CHAIN_NOISE_ALIVE;
 
-	if (priv->vif)
-		dtimper = priv->hw->conf.ps_dtim_period;
-	else
-		dtimper = 1;
+	dtimper = priv->hw->conf.ps_dtim_period ?: 1;
 
 	if (priv->cfg->broken_powersave)
 		iwl_power_sleep_cam_cmd(priv, &cmd);