net: wireless: bcm4329: Fix interrupt enabling in case of error
authorDmitry Shmidt <dimitrysh@google.com>
Thu, 16 Sep 2010 22:47:05 +0000 (15:47 -0700)
committerColin Cross <ccross@android.com>
Thu, 30 Sep 2010 00:49:49 +0000 (17:49 -0700)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
drivers/net/wireless/bcm4329/dhd_sdio.c

index 874ce16ce907263b7a4bb83500400f0244f9b2bd..bd735568e2aec2d64d29328a15938adb0a4e1b36 100644 (file)
@@ -4218,9 +4218,6 @@ dhdsdio_dpc(dhd_bus_t *bus)
        bus->intstatus = intstatus;
 
 clkwait:
-#if defined(OOB_INTR_ONLY)
-       bcmsdh_oob_intr_set(1);
-#endif /* (OOB_INTR_ONLY) */
        /* Re-enable interrupts to detect new device events (mailbox, rx frame)
         * or clock availability.  (Allows tx loop to check ipend if desired.)
         * (Unless register access seems hosed, as we may not be able to ACK...)
@@ -4229,6 +4226,9 @@ clkwait:
                DHD_INTR(("%s: enable SDIO interrupts, rxdone %d framecnt %d\n",
                          __FUNCTION__, rxdone, framecnt));
                bus->intdis = FALSE;
+#if defined(OOB_INTR_ONLY)
+               bcmsdh_oob_intr_set(1);
+#endif /* (OOB_INTR_ONLY) */
                bcmsdh_intr_enable(sdh);
        }