brcm80211: fmac: allow wd timer to be disabled when bus down (ece960ea) · Commits · 戴 / test

Watchdog timer should be able to be stopped even firmware is not loaded. Reviewed-by:

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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)