summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorweongyo <weongyo@FreeBSD.org>2008-09-19 05:10:33 +0000
committerweongyo <weongyo@FreeBSD.org>2008-09-19 05:10:33 +0000
commit8e8ffe74e6594137ffa62ce267a374a724054622 (patch)
tree1ba20b3c17fbd187f6e3f97282222ecf12961cd9
parenta4db62b632414fd1505e47f0be9e96f0cacd354c (diff)
downloadFreeBSD-src-8e8ffe74e6594137ffa62ce267a374a724054622.zip
FreeBSD-src-8e8ffe74e6594137ffa62ce267a374a724054622.tar.gz
clear pending callbacks when the driver try to change the state
Pointed by: sam
-rw-r--r--sys/dev/usb/if_zyd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index cc6c607..58cdf2f1 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -763,7 +763,9 @@ zyd_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
struct ieee80211com *ic = vap->iv_ic;
struct zyd_softc *sc = ic->ic_ifp->if_softc;
+ usb_rem_task(sc->sc_udev, &sc->sc_scantask);
usb_rem_task(sc->sc_udev, &sc->sc_task);
+ callout_stop(&sc->sc_watchdog_ch);
/* do it in a process context */
sc->sc_state = nstate;
OpenPOWER on IntegriCloud