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 0cf6508b527b66a9307f8b983fb52ac0059fe72a..34f45b427b4f35b7665dcde4da48cbdb8f869c6e 100644 (file)
--- 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);
                        }
                }