diff options
| author | Franky Lin <frankyl@broadcom.com> | 2011-10-21 16:16:19 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-08 15:54:14 -0500 |
| commit | ece960eae81c604aa14a1bf431eda34f4fe71c0c (patch) | |
| tree | 7e7db75e871ad338abe5645278086be7c8b3d6b3 | |
| parent | 152c477aa3eb8046b35aa7cde2782230064041d8 (diff) | |
| download | linux-3.10-ece960eae81c604aa14a1bf431eda34f4fe71c0c.tar.gz linux-3.10-ece960eae81c604aa14a1bf431eda34f4fe71c0c.tar.bz2 linux-3.10-ece960eae81c604aa14a1bf431eda34f4fe71c0c.zip | |
brcm80211: fmac: allow wd timer to be disabled when bus down
Watchdog timer should be able to be stopped even firmware is not
loaded.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -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 c6825f23b3f..785ab089f26 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) void brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) { - /* don't start the wd until fw is loaded */ - if (bus->drvr->busstate == BRCMF_BUS_DOWN) - return; - /* Totally stop the timer */ if (!wdtick && bus->wd_timer_valid == true) { del_timer_sync(&bus->timer); @@ -4591,6 +4587,10 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) return; } + /* don't start the wd until fw is loaded */ + if (bus->drvr->busstate == BRCMF_BUS_DOWN) + return; + if (wdtick) { if (bus->save_ms != BRCMF_WD_POLL_MS) { if (bus->wd_timer_valid == true) |