diff options
author | Liad Kaufman <liad.kaufman@intel.com> | 2015-01-04 04:03:13 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-22 10:53:56 -0500 |
commit | e93475a0ff492000bfd911f44626a3d1d44025b5 (patch) | |
tree | a7c7e012cbd919a1bda0357f1aa92be18df2db01 | |
parent | e5d74646526335a00c9591578a188dfb59ad745b (diff) |
iwlwifi: mvm: make sure state isn't in d0i3 when stopping fw monitor
In case platform is in d0i3 - make sure it is awake when
writing the registers to stop the monitor when collecting FW
debug data. Plus, remove unneeded mutex locking currently
done.
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/debugfs.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c index f89b795fd4be..afd1986a3216 100644 --- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c | |||
@@ -988,9 +988,14 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm, | |||
988 | char *buf, size_t count, | 988 | char *buf, size_t count, |
989 | loff_t *ppos) | 989 | loff_t *ppos) |
990 | { | 990 | { |
991 | mutex_lock(&mvm->mutex); | 991 | int ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PRPH_WRITE); |
992 | |||
993 | if (ret) | ||
994 | return ret; | ||
995 | |||
992 | iwl_mvm_fw_dbg_collect(mvm); | 996 | iwl_mvm_fw_dbg_collect(mvm); |
993 | mutex_unlock(&mvm->mutex); | 997 | |
998 | iwl_mvm_unref(mvm, IWL_MVM_REF_PRPH_WRITE); | ||
994 | 999 | ||
995 | return count; | 1000 | return count; |
996 | } | 1001 | } |