PERFORCE change 168376 for review

[Hans Petter Selasky]

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

Change 168376 by hselasky at hselasky_laptop001 on 2009/09/09 18:45:53

	
	USB CORE:
	 - Make sure the "control_act" flag is cleared in
	special usbd_transfer_stop/drain case. This fix
	only affect control endpoints, but not during
	normal operation. Only during error injection
	mode this fix makes a difference.

Affected files ...

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

Differences ...

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

@@ -1332,7 +1332,9 @@
 	/* check if there is a length mismatch */
 
 	if (len > xfer->flags_int.control_rem) {
-		DPRINTFN(0, "Length greater than remaining length!\n");
+		DPRINTFN(0, "Length(%d) greater than "
+		    "remaining length(%d)!\n", len,
+		    xfer->flags_int.control_rem);
 		goto error;
 	}
 	/* check if we are doing a short transfer */
@@ -2190,6 +2192,8 @@
 	 */
 	if (!xfer->flags_int.transferring) {
 		DPRINTF("not transferring\n");
+		/* end of control transfer, if any */
+		xfer->flags_int.control_act = 0;
 		return;
 	}
 	/* only set transfer error if not already set */