summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach2012-06-17 15:12:42 +0200
committerJohannes Berg2012-06-18 10:46:37 +0200
commit3595c003f962bcf089f83e8ea44fd3169ad60ca3 (patch)
tree0151dc6100537a8d5e2341de28c876df9b798450 /drivers/net/wireless/iwlwifi/iwl-notif-wait.c
parentiwlwifi: disable BH before the call to iwl_op_mode_nic_error (diff)
downloadkernel-qcow2-linux-3595c003f962bcf089f83e8ea44fd3169ad60ca3.tar.gz
kernel-qcow2-linux-3595c003f962bcf089f83e8ea44fd3169ad60ca3.tar.xz
kernel-qcow2-linux-3595c003f962bcf089f83e8ea44fd3169ad60ca3.zip
iwlwifi: don't disable interrupt in iwl_abort_notification_waits
This is not needed since notif_wait_lock is never accessed from IRQ. 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/iwl-notif-wait.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-notif-wait.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
index 5cfed29b1b18..c61f2070f15a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
@@ -121,13 +121,12 @@ EXPORT_SYMBOL_GPL(iwl_notification_wait_notify);
void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
{
- unsigned long flags;
struct iwl_notification_wait *wait_entry;
- spin_lock_irqsave(&notif_wait->notif_wait_lock, flags);
+ spin_lock(&notif_wait->notif_wait_lock);
list_for_each_entry(wait_entry, &notif_wait->notif_waits, list)
wait_entry->aborted = true;
- spin_unlock_irqrestore(&notif_wait->notif_wait_lock, flags);
+ spin_unlock(&notif_wait->notif_wait_lock);
wake_up_all(&notif_wait->notif_waitq);
}