From owner-p4-projects@FreeBSD.ORG  Sat Sep 12 10:35:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B351D10656A6; Sat, 12 Sep 2009 10:35:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 780421065670
	for <perforce@FreeBSD.org>; Sat, 12 Sep 2009 10:35:18 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 671258FC16
	for <perforce@FreeBSD.org>; Sat, 12 Sep 2009 10:35:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8CAZIP9001246
	for <perforce@FreeBSD.org>; Sat, 12 Sep 2009 10:35:18 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8CAZINT001244
	for perforce@freebsd.org; Sat, 12 Sep 2009 10:35:18 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 12 Sep 2009 10:35:18 GMT
Message-Id: <200909121035.n8CAZINT001244@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 168458 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Sep 2009 10:35:18 -0000

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

Change 168458 by hselasky@hselasky_laptop001 on 2009/09/12 10:34:22

	
	USB CORE:
	 - revert the previous did_dma_delay patch.
	 We should not clobber xfer->flags_int when the
	 transfer mutex is not locked. Due to the locking
	 order this is not possible when in the DMA delay
	 callback.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#167 edit

Differences ...

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

@@ -2123,9 +2123,6 @@
 
 	DPRINTFN(3, "Completed %p\n", xfer);
 
-	/* only delay once */
-	xfer->flags_int.did_dma_delay = 1;
-
 	/* queue callback for execution, again */
 	usbd_transfer_done(xfer, 0);
 }
@@ -2495,6 +2492,9 @@
 
 		usb_timeout_t temp;
 
+		/* only delay once */
+		xfer->flags_int.did_dma_delay = 1;
+
 		/* we can not cancel this delay */
 		xfer->flags_int.can_cancel_immed = 0;