From owner-cvs-src@FreeBSD.ORG Tue Nov 16 00:48:28 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09C5316A4D0; Tue, 16 Nov 2004 00:48:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAAE243D49; Tue, 16 Nov 2004 00:48:27 +0000 (GMT) (envelope-from iedowse@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAG0mRjR029092; Tue, 16 Nov 2004 00:48:27 GMT (envelope-from iedowse@repoman.freebsd.org) Received: (from iedowse@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAG0mRcb029091; Tue, 16 Nov 2004 00:48:27 GMT (envelope-from iedowse) Message-Id: <200411160048.iAG0mRcb029091@repoman.freebsd.org> From: Ian Dowse Date: Tue, 16 Nov 2004 00:48:27 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/usb ehci.c ohci.c uhci.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Nov 2004 00:48:28 -0000 iedowse 2004-11-16 00:48:27 UTC FreeBSD src repository Modified files: sys/dev/usb ehci.c ohci.c uhci.c Log: Fix just the worst of the timeout race conditions that the previous backed out commits were trying to address: when cancelling the timeout callout, also cancel the abort_task event, since it is possible that the timeout has already fired and set up an abort_task. Revision Changes Path 1.20 +5 -1 src/sys/dev/usb/ehci.c 1.147 +6 -1 src/sys/dev/usb/ohci.c 1.159 +2 -1 src/sys/dev/usb/uhci.c