PERFORCE change 106202 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=106202

Change 106202 by hselasky at hselasky_mini_itx on 2006/09/16 13:42:44

	Added missing callout_drain() at various places.

Affected files ...

.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#11 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#7 (text) ====

@@ -504,6 +504,8 @@
 
     usbd_transfer_drain(&(sc->mem_wait), &(sc->locked_mtx));
 
+    __callout_drain(&(sc->watchdog));
+
     mtx_destroy(&sc->locked_mtx);
     return 0;
 }

==== //depot/projects/usb/src/sys/dev/usb/ehci.c#11 (text+ko) ====

@@ -367,6 +367,9 @@
 	DELAY(1000*300); /* XXX let stray task complete */
 
 	mtx_unlock(&sc->sc_bus.mtx);
+
+	__callout_drain(&(sc->sc_tmo_pcd));
+
 	return;
 }
 

==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#10 (text+ko) ====

@@ -998,6 +998,8 @@
 
 	usbd_config_td_unsetup(&(sc->sc_config_td));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#9 (text+ko) ====

@@ -800,6 +800,8 @@
 
 	usbd_config_td_unsetup(&(sc->sc_config_td));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#9 (text+ko) ====

@@ -632,6 +632,8 @@
 
 	usbd_config_td_unsetup(&(sc->sc_config_td));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#10 (text+ko) ====

@@ -668,6 +668,8 @@
 
 	usbd_config_td_unsetup(&(sc->sc_config_td));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#8 (text+ko) ====

@@ -899,6 +899,8 @@
 
 	usbd_config_td_unsetup(&(sc->sc_config_td));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#8 (text+ko) ====

@@ -506,6 +506,8 @@
 
 	usbd_config_td_unsetup(&(sc->sc_config_td));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#10 (text+ko) ====

@@ -142,7 +142,8 @@
 ural_ack_rate(struct ieee80211com *ic, u_int16_t rate);
 
 static u_int16_t
-ural_txtime(struct ural_softc *sc, u_int16_t len, u_int16_t rate, u_int32_t flags);
+ural_txtime(struct ural_softc *sc, u_int16_t len, u_int16_t rate, 
+	    u_int32_t flags);
 
 static u_int8_t
 ural_plcp_signal(u_int16_t rate);
@@ -614,6 +615,8 @@
 
 	usbd_config_td_unsetup(&(sc->sc_config_td));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&sc->sc_mtx);
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/ohci.c#10 (text+ko) ====

@@ -383,6 +383,9 @@
 	DELAY(1000*300); /* XXX let stray task complete */
 
 	mtx_unlock(&sc->sc_bus.mtx);
+
+	__callout_drain(&(sc->sc_tmo_rhsc));
+
 	return;
 }
 

==== //depot/projects/usb/src/sys/dev/usb/uhci.c#10 (text+ko) ====


==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#15 (text+ko) ====

@@ -700,6 +700,8 @@
 
 	usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx));
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/ums.c#11 (text+ko) ====

@@ -573,6 +573,8 @@
 
 	usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx));
 
+	__callout_drain(&(sc->sc_callout));
+
 	mtx_destroy(&(sc->sc_mtx));
 
 	return 0;

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#18 (text+ko) ====


==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#11 (text+ko) ====

@@ -511,6 +511,8 @@
 
 	usbd_transfer_drain(&(sc->sc_mem_wait), &Giant);
 
+	__callout_drain(&(sc->sc_watchdog));
+
 	return 0;
 }