From: Greg Goldman <ggoldman@broadcom.com>
Date: Tue, 10 Aug 2010 22:15:26 +0000 (-0700)
Subject: net: wireless: bcm4329: Fix dhd_bus_watchdog() race conditions
X-Git-Tag: firefly_0821_release~9833^2~5^2~155
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3a36e1fb80ec6b5c760da689b70702c3198266de;p=firefly-linux-kernel-4.4.55.git

net: wireless: bcm4329: Fix dhd_bus_watchdog() race conditions

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---

diff --git a/drivers/net/wireless/bcm4329/dhd_sdio.c b/drivers/net/wireless/bcm4329/dhd_sdio.c
index 0cf6508b527b..34f45b427b4f 100644
--- a/drivers/net/wireless/bcm4329/dhd_sdio.c
+++ b/drivers/net/wireless/bcm4329/dhd_sdio.c
@@ -4694,8 +4694,6 @@ dhd_bus_watchdog(dhd_pub_t *dhdp)
 			bus->idlecount = 0;
 			if (bus->activity) {
 				bus->activity = FALSE;
-				dhd_os_wd_timer(bus->dhd,dhd_watchdog_ms);
-			} else {
 				dhdsdio_clkctl(bus, CLK_NONE, FALSE);
 			}
 		}