PERFORCE change 168458 for review

[Hans Petter Selasky]

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

Change 168458 by hselasky at 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;