OSDN Git Service

iwlwifi: mvm: don't double unlock the mutex in __iwl_mvm_resume()
authorLuciano Coelho <luciano.coelho@intel.com>
Thu, 12 Mar 2015 07:25:15 +0000 (09:25 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 12 Mar 2015 07:57:48 +0000 (09:57 +0200)
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>
drivers/net/wireless/iwlwifi/mvm/d3.c

index 486fd4c..e3c3084 100644 (file)
@@ -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: