From d1dc1d00a5558cb727fdc21f44e1dba3c8e60d60 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Sun, 17 Jun 2012 16:12:42 +0300 Subject: [PATCH] --- yaml --- r: 314753 b: refs/heads/master c: 3595c003f962bcf089f83e8ea44fd3169ad60ca3 h: refs/heads/master i: 314751: 93b430e6b4fb3f50a0c6b8fbeb79f4e7799e35f1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2cd12a0d1467..185b4e9a8f8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24172f39b02e5fcd35a4f721bde5bc9b61534736 +refs/heads/master: 3595c003f962bcf089f83e8ea44fd3169ad60ca3 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/trunk/drivers/net/wireless/iwlwifi/iwl-notif-wait.c index 5cfed29b1b18..c61f2070f15a 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-notif-wait.c +++ b/trunk/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(¬if_wait->notif_wait_lock, flags); + spin_lock(¬if_wait->notif_wait_lock); list_for_each_entry(wait_entry, ¬if_wait->notif_waits, list) wait_entry->aborted = true; - spin_unlock_irqrestore(¬if_wait->notif_wait_lock, flags); + spin_unlock(¬if_wait->notif_wait_lock); wake_up_all(¬if_wait->notif_waitq); }