diff options
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index c6825f23b3f7..785ab089f26e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -4579,10 +4579,6 @@ struct device *brcmf_bus_get_device(struct brcmf_bus *bus) | |||
4579 | void | 4579 | void |
4580 | brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) | 4580 | brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) |
4581 | { | 4581 | { |
4582 | /* don't start the wd until fw is loaded */ | ||
4583 | if (bus->drvr->busstate == BRCMF_BUS_DOWN) | ||
4584 | return; | ||
4585 | |||
4586 | /* Totally stop the timer */ | 4582 | /* Totally stop the timer */ |
4587 | if (!wdtick && bus->wd_timer_valid == true) { | 4583 | if (!wdtick && bus->wd_timer_valid == true) { |
4588 | del_timer_sync(&bus->timer); | 4584 | del_timer_sync(&bus->timer); |
@@ -4591,6 +4587,10 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) | |||
4591 | return; | 4587 | return; |
4592 | } | 4588 | } |
4593 | 4589 | ||
4590 | /* don't start the wd until fw is loaded */ | ||
4591 | if (bus->drvr->busstate == BRCMF_BUS_DOWN) | ||
4592 | return; | ||
4593 | |||
4594 | if (wdtick) { | 4594 | if (wdtick) { |
4595 | if (bus->save_ms != BRCMF_WD_POLL_MS) { | 4595 | if (bus->save_ms != BRCMF_WD_POLL_MS) { |
4596 | if (bus->wd_timer_valid == true) | 4596 | if (bus->wd_timer_valid == true) |