---

yaml
---
r: 277623
b: refs/heads/master
c: ece960e
h: refs/heads/master
i:
  277621: eaa0fb4
  277619: c8c50c0
  277615: 512f684
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 152c477aa3eb8046b35aa7cde2782230064041d8
+refs/heads/master: ece960eae81c604aa14a1bf431eda34f4fe71c0c

trunk/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)