summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/d3.c
diff options
context:
space:
mode:
authorLuciano Coelho2015-03-12 08:25:15 +0100
committerEmmanuel Grumbach2015-03-12 08:57:48 +0100
commit0c2ae049aef7fe1b8800db3f28c23520150bfd78 (patch)
treed93f60dbb888b68dd3683bcf7040baef7a1680f7 /drivers/net/wireless/iwlwifi/mvm/d3.c
parentiwlwifi: mvm: clarify time event end handling (diff)
downloadkernel-qcow2-linux-0c2ae049aef7fe1b8800db3f28c23520150bfd78.tar.gz
kernel-qcow2-linux-0c2ae049aef7fe1b8800db3f28c23520150bfd78.tar.xz
kernel-qcow2-linux-0c2ae049aef7fe1b8800db3f28c23520150bfd78.zip
iwlwifi: mvm: don't double unlock the mutex in __iwl_mvm_resume()
When IWLWIFI_DEBUGFS is not set, we should not unlock the mutex after calling iwl_mvm_query_wakeup_reasons(), because this function unlocks it already. Move the goto out_iterate outside the #ifdef. Change-Id: I13d86402aecf0eeec44b1abbe2b244fbc706a5eb Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/d3.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/d3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index 486fd4c259c3..e3c308435bee 100644
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -1892,9 +1892,9 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
#ifdef CONFIG_IWLWIFI_DEBUGFS
if (keep)
mvm->keep_vif = vif;
+#endif
/* has unlocked the mutex, so skip that */
goto out_iterate;
-#endif
}
out_unlock: