summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie/trans.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach2012-06-17 15:04:25 +0200
committerJohannes Berg2012-06-18 10:46:26 +0200
commit24172f39b02e5fcd35a4f721bde5bc9b61534736 (patch)
tree79aae5dbdc44cf528f9c5fbead96870c878e448e /drivers/net/wireless/iwlwifi/pcie/trans.c
parentiwlwifi: comment context requirements of the op_mode (diff)
downloadkernel-qcow2-linux-24172f39b02e5fcd35a4f721bde5bc9b61534736.tar.gz
kernel-qcow2-linux-24172f39b02e5fcd35a4f721bde5bc9b61534736.tar.xz
kernel-qcow2-linux-24172f39b02e5fcd35a4f721bde5bc9b61534736.zip
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/trans.c')
-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,
if (!trans->op_mode)
return -EAGAIN;
+ local_bh_disable();
iwl_op_mode_nic_error(trans->op_mode);
+ local_bh_enable();
return count;
}