From 4fd50bf44b784697be5842ded8f23b34d51b88aa Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Thu, 9 Feb 2012 21:09:07 +0100
Subject: [PATCH] --- yaml --- r: 290623 b: refs/heads/master c:
 cf44066a3836847a74f6a0817c680726b796239f h: refs/heads/master i:   290621:
 7b0761f7505e3929ac7fc6ee85ab51f1f5346657   290619:
 51500bd47b402bd463b4be97a4130118ab7af7f4   290615:
 ab3cb2042579dbcffaafcda46df076462acdd97a   290607:
 0b268032c78f234ec60a0ba83fd46e2ff9aae979   290591:
 9d8b7c9c726f9acab60cb81c72564bf583dba93d   290559:
 fb5cd08d0a81d3f00e7f4621708ee20bdbf2d509 v: v3

---
 [refs]                                                      | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b6ffece84cc7..9d7398ff5090 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcbec9e777cc66fbbeb386c42d8af680fc941da7
+refs/heads/master: cf44066a3836847a74f6a0817c680726b796239f
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 285fa19e881d..15d7f00513be 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3308,6 +3308,7 @@ brcmf_enq_event(struct brcmf_cfg80211_priv *cfg_priv, u32 event,
 {
 	struct brcmf_cfg80211_event_q *e;
 	s32 err = 0;
+	ulong flags;
 
 	e = kzalloc(sizeof(struct brcmf_cfg80211_event_q), GFP_ATOMIC);
 	if (!e)
@@ -3316,9 +3317,9 @@ brcmf_enq_event(struct brcmf_cfg80211_priv *cfg_priv, u32 event,
 	e->etype = event;
 	memcpy(&e->emsg, msg, sizeof(struct brcmf_event_msg));
 
-	spin_lock_irq(&cfg_priv->evt_q_lock);
+	spin_lock_irqsave(&cfg_priv->evt_q_lock, flags);
 	list_add_tail(&e->evt_q_list, &cfg_priv->evt_q_list);
-	spin_unlock_irq(&cfg_priv->evt_q_lock);
+	spin_unlock_irqrestore(&cfg_priv->evt_q_lock, flags);
 
 	return err;
 }