PERFORCE change 131881 for review

[Hans Petter Selasky]

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

Change 131881 by hselasky at hselasky_laptop001 on 2007/12/28 17:11:49

	
	Invalid actual length and actual frames
	can happen when we are cancelling an USB
	transfer. Only panic if this happens when
	the USB transfer is complete.

Affected files ...

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

Differences ...

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

@@ -2674,12 +2674,14 @@
 
 	/* check actual number of frames */
 	if (xfer->aframes > xfer->nframes) {
+	  if (error == 0) {
 		panic("%s: actual number of frames, %d, is "
 		    "greater than initial number of frames, %d!\n",
 		    __FUNCTION__, xfer->aframes, xfer->nframes);
-
-		/* XXX */
+	  } else {
+		/* just set some valid value */
 		xfer->aframes = xfer->nframes;
+	  }
 	}
 	/* compute actual length */
 	xfer->actlen = 0;
@@ -2699,11 +2701,14 @@
 
 	/* check actual length */
 	if (xfer->actlen > xfer->sumlen) {
+	  if (error == 0) {
 		panic("%s: actual length, %d, is greater than "
 		    "initial length, %d!\n",
 		    __FUNCTION__, xfer->actlen, xfer->sumlen);
-		/* XXX */
+	  } else {
+	    /* just set some valid value */
 		xfer->actlen = xfer->sumlen;
+	  }
 	}
 	PRINTFN(5, ("xfer=%p pipe=%p sts=%d alen=%d, slen=%d, afrm=%d, nfrm=%d\n",
 	    xfer, xfer->pipe, error, xfer->actlen, xfer->sumlen,