diff options
| author |   Arend van Spriel <arend@broadcom.com> | 2014-01-06 12:40:44 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2014-01-06 15:48:03 -0500 |
| commit | d6ae2c51becb5b901cbaf321e24a6362b14e4cdc (patch) | |
| tree | 3611083b50eea3d6cf7a00af37f8e25e86f3d6d2 /drivers/net/wireless/brcm80211 | |
| parent | brcmfmac: correct detection of save&restore device capability (diff) | |
| download | linux-dev-d6ae2c51becb5b901cbaf321e24a6362b14e4cdc.tar.xz linux-dev-d6ae2c51becb5b901cbaf321e24a6362b14e4cdc.zip | |
brcmfmac: enable watchdog when bus initialization is complete
Change condition in brcmf_sdio_wd_timer() function to program
watchdog only when in BRCMF_BUS_DATA state. This avoids watchdog
being active during initialization. During initialization the
SDIO save&restore capability is determined which affect the
bus sleep mechanism used in watchdog thread.
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index ae5f040edb1c..124f5e8adfc9 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -4105,7 +4105,7 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick) } /* don't start the wd until fw is loaded */ - if (bus->sdiodev->bus_if->state == BRCMF_BUS_DOWN) + if (bus->sdiodev->bus_if->state != BRCMF_BUS_DATA) return; if (wdtick) { |