From owner-p4-projects@FreeBSD.ORG Sat Sep 16 13:43:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84F4B16A415; Sat, 16 Sep 2006 13:43:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A91316A403 for ; Sat, 16 Sep 2006 13:43:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4A3043D5A for ; Sat, 16 Sep 2006 13:43:12 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8GDhCaC052029 for ; Sat, 16 Sep 2006 13:43:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8GDhCW4052026 for perforce@freebsd.org; Sat, 16 Sep 2006 13:43:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 16 Sep 2006 13:43:12 GMT Message-Id: <200609161343.k8GDhCW4052026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Sep 2006 13:43:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=106202 Change 106202 by hselasky@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; }