From 95f0fb5f07bce6632fa4d64ba04a46a2a9f7fc27 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Wed, 23 Nov 2011 21:30:19 -0600
Subject: [PATCH] --- yaml --- r: 278415 b: refs/heads/master c:
 de2e56cea25c80f91a6c6699de40fb3fe8b2479d h: refs/heads/master i:   278413:
 b42650fb9c44b804022793983569e1b7dd1e737c   278411:
 4c70eb6551b0e2d5320405b9a742ffe176653b78   278407:
 fb3327ce4d0f605d20a7b375b5b36054d7c864f3   278399:
 e90cd59506ea71dba5415006d3296af128214ddf v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/rtlwifi/pci.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d39adf6a223d..8add7ed29c21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc192f8918ab8e41ba53b9ef881bc425ae92ed1b
+refs/heads/master: de2e56cea25c80f91a6c6699de40fb3fe8b2479d
diff --git a/trunk/drivers/net/wireless/rtlwifi/pci.c b/trunk/drivers/net/wireless/rtlwifi/pci.c
index b6683a247b51..91f0525364ea 100644
--- a/trunk/drivers/net/wireless/rtlwifi/pci.c
+++ b/trunk/drivers/net/wireless/rtlwifi/pci.c
@@ -780,6 +780,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
 	unsigned long flags;
 	u32 inta = 0;
 	u32 intb = 0;
+	irqreturn_t ret = IRQ_HANDLED;
 
 	spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
 
@@ -787,8 +788,10 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
 	rtlpriv->cfg->ops->interrupt_recognized(hw, &inta, &intb);
 
 	/*Shared IRQ or HW disappared */
-	if (!inta || inta == 0xffff)
+	if (!inta || inta == 0xffff) {
+		ret = IRQ_NONE;
 		goto done;
+	}
 
 	/*<1> beacon related */
 	if (inta & rtlpriv->cfg->maps[RTL_IMR_TBDOK]) {
@@ -892,7 +895,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
 
 done:
 	spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-	return IRQ_HANDLED;
+	return ret;
 }
 
 static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)