projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d0a7955
)
Revert "net: wireless: bcm4329: Fix interrupt enabling for level interrupt"
author
Rebecca Schultz Zavin
<rebecca@android.com>
Sat, 28 Aug 2010 01:40:43 +0000
(18:40 -0700)
committer
Colin Cross
<ccross@android.com>
Thu, 30 Sep 2010 00:49:46 +0000
(17:49 -0700)
This reverts commit
261d21bbfffef6261696d0d13672d2e4f9d76f05
.
drivers/net/wireless/bcm4329/dhd_sdio.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/bcm4329/dhd_sdio.c
b/drivers/net/wireless/bcm4329/dhd_sdio.c
index 7b54f60e6f7243e462da722cd83661346c0fbbe5..8bdadb3fc1dbcfb623e74e4df70cfb35adaaf889 100644
(file)
--- a/
drivers/net/wireless/bcm4329/dhd_sdio.c
+++ b/
drivers/net/wireless/bcm4329/dhd_sdio.c
@@
-4154,6
+4154,9
@@
dhdsdio_dpc(dhd_bus_t *bus)
if (newstatus) {
W_SDREG(newstatus, ®s->intstatus, retries);
bus->f1regdata++;
+#if defined(OOB_INTR_ONLY)
+ bcmsdh_oob_intr_set(1);
+#endif
}
}
@@
-4219,10
+4222,6
@@
dhdsdio_dpc(dhd_bus_t *bus)
clkwait:
-#if defined(OOB_INTR_ONLY)
- bcmsdh_oob_intr_set(1);
-#endif
-
/* 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...)