wl1271: Fix event handling mechanism

The event handling mechanism could miss events if multiple events would
occur simultaneously. Fix event handling mechanism to process all
events.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 19dbdb1b38ab..d6d1a4c1b114 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -437,14 +437,15 @@ static void wl1271_irq_work(struct work_struct *work)
 
         intr &= WL1271_INTR_MASK;
 
-        if (intr & (WL1271_ACX_INTR_EVENT_A |
-                    WL1271_ACX_INTR_EVENT_B)) {
-                wl1271_debug(DEBUG_IRQ,
-                             "WL1271_ACX_INTR_EVENT (0x%x)", intr);
-                if (intr & WL1271_ACX_INTR_EVENT_A)
-                        wl1271_event_handle(wl, 0);
-                else
-                        wl1271_event_handle(wl, 1);
+        if (intr & WL1271_ACX_INTR_EVENT_A) {
+                bool do_ack = (intr & WL1271_ACX_INTR_EVENT_B) ? false : true;
+                wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_EVENT_A");
+                wl1271_event_handle(wl, 0, do_ack);
+        }
+
+        if (intr & WL1271_ACX_INTR_EVENT_B) {
+                wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_EVENT_B");
+                wl1271_event_handle(wl, 1, true);
         }
 
         if (intr & WL1271_ACX_INTR_INIT_COMPLETE)