aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-06-17 09:04:25 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-18 04:46:26 -0400
commit24172f39b02e5fcd35a4f721bde5bc9b61534736 (patch)
tree79aae5dbdc44cf528f9c5fbead96870c878e448e
parent901787c1674ee5d35c7c3713efbc009c72f43971 (diff)
iwlwifi: disable BH before the call to iwl_op_mode_nic_error
This is required by the op_mode API. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index c6f53af639c6..e20880acdd34 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -2026,7 +2026,9 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
2026 if (!trans->op_mode) 2026 if (!trans->op_mode)
2027 return -EAGAIN; 2027 return -EAGAIN;
2028 2028
2029 local_bh_disable();
2029 iwl_op_mode_nic_error(trans->op_mode); 2030 iwl_op_mode_nic_error(trans->op_mode);
2031 local_bh_enable();
2030 2032
2031 return count; 2033 return count;
2032} 2034}