From 344abc562b28970c1a3c27baf53f5be1a693606c Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 29 Apr 2010 04:43:08 -0700
Subject: [PATCH] --- yaml --- r: 195215 b: refs/heads/master c:
 3a065ab3b57bedefa1d59c88f731da6513ac482a h: refs/heads/master i:   195213:
 e83e183e082ed3a619f24766cd2a2a94add6689c   195211:
 3683c374fe7ae4dcff317c5432a6af27df6fed7c   195207:
 b76f8e676c594d4e7ca18e3264c950248c83fdf6   195199:
 bf46c74b2e2aab2256f5d5ff4d6d2c07e9108bd5 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-power.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6f6670a07ac9..4421edf90eb4 100644
--- 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
index 2655dbdc8175..1fe9d844313d 100644
--- 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);