diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-06-17 09:12:42 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-18 04:46:37 -0400 |
commit | 3595c003f962bcf089f83e8ea44fd3169ad60ca3 (patch) | |
tree | 0151dc6100537a8d5e2341de28c876df9b798450 /drivers/net/wireless/iwlwifi/iwl-notif-wait.c | |
parent | 24172f39b02e5fcd35a4f721bde5bc9b61534736 (diff) |
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.c | 5 |
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); | |||
121 | 121 | ||
122 | void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait) | 122 | void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait) |
123 | { | 123 | { |
124 | unsigned long flags; | ||
125 | struct iwl_notification_wait *wait_entry; | 124 | struct iwl_notification_wait *wait_entry; |
126 | 125 | ||
127 | spin_lock_irqsave(¬if_wait->notif_wait_lock, flags); | 126 | spin_lock(¬if_wait->notif_wait_lock); |
128 | list_for_each_entry(wait_entry, ¬if_wait->notif_waits, list) | 127 | list_for_each_entry(wait_entry, ¬if_wait->notif_waits, list) |
129 | wait_entry->aborted = true; | 128 | wait_entry->aborted = true; |
130 | spin_unlock_irqrestore(¬if_wait->notif_wait_lock, flags); | 129 | spin_unlock(¬if_wait->notif_wait_lock); |
131 | 130 | ||
132 | wake_up_all(¬if_wait->notif_waitq); | 131 | wake_up_all(¬if_wait->notif_waitq); |
133 | } | 132 | } |