Permalink
Browse files

net: wireless: bcm4329: Disable wake irq at driver stop

Previously at driver stop interrupts were not disabled and
might cause never-ending waking up

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
  • Loading branch information...
1 parent b7c5917 commit 6ce9cbeef4cb7074beffbd5652b0943c8aec1246 Dmitry Shmidt committed Mar 10, 2011
Showing with 20 additions and 1 deletion.
  1. +14 −0 drivers/net/wireless/bcm4329/bcmsdh_linux.c
  2. +6 −1 drivers/net/wireless/bcm4329/dhd_sdio.c
@@ -643,6 +643,20 @@ int bcmsdh_register_oob_intr(void * dhdp)
return 0;
}
+void bcmsdh_set_irq(int flag)
+{
+ if (sdhcinfo->oob_irq_registered) {
+ SDLX_MSG(("%s Flag = %d", __FUNCTION__, flag));
+ if (flag) {
+ enable_irq(sdhcinfo->oob_irq);
+ enable_irq_wake(sdhcinfo->oob_irq);
+ } else {
+ disable_irq_wake(sdhcinfo->oob_irq);
+ disable_irq(sdhcinfo->oob_irq);
+ }
+ }
+}
+
void bcmsdh_unregister_oob_intr(void)
{
SDLX_MSG(("%s: Enter\n", __FUNCTION__));
@@ -146,6 +146,8 @@
DHD_SPINWAIT_SLEEP_INIT(sdioh_spinwait_sleep);
extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len);
+extern void bcmsdh_set_irq(int flag);
+
#ifdef DHD_DEBUG
/* Device console log buffer state */
typedef struct dhd_console {
@@ -5809,7 +5811,9 @@ dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag)
/* Expect app to have torn down any connection before calling */
/* Stop the bus, disable F2 */
dhd_bus_stop(bus, FALSE);
-
+#if defined(OOB_INTR_ONLY)
+ bcmsdh_set_irq(FALSE);
+#endif /* defined(OOB_INTR_ONLY) */
/* Clean tx/rx buffer pointers, detach from the dongle */
dhdsdio_release_dongle(bus, bus->dhd->osh, TRUE);
@@ -5845,6 +5849,7 @@ dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag)
bcmerror = dhd_bus_init((dhd_pub_t *) bus->dhd, FALSE);
if (bcmerror == BCME_OK) {
#if defined(OOB_INTR_ONLY)
+ bcmsdh_set_irq(TRUE);
dhd_enable_oob_intr(bus, TRUE);
#endif /* defined(OOB_INTR_ONLY) */
bus->dhd->dongle_reset = FALSE;

0 comments on commit 6ce9cbe

Please sign in to comment.