--- linux/Documentation/usb/error-codes.bak	Thu Dec  7 16:13:38 2000
+++ linux/Documentation/usb/error-codes.txt	Mon Oct 15 14:07:51 2001
@@ -79,8 +79,7 @@
 -EILSEQ			CRC mismatch
 
 USB_ST_STALL
--EPIPE			a) babble detect
-			b) endpoint stalled
+-EPIPE			endpoint stalled
 
 USB_ST_BUFFEROVERRUN
 -ECOMM			During an IN transfer, the host controller
@@ -95,7 +94,7 @@
 USB_ST_DATAOVERRUN
 -EOVERFLOW		The amount of data returned by the endpoint was
 			greater than either the max packet size of the
-			endpoint or the remaining buffer size
+			endpoint or the remaining buffer size.  "Babble".
 
 USB_ST_DATAUNDERRUN
 -EREMOTEIO		The endpoint returned less than max packet size
--- linux/drivers/usb-pre2/uhci.c	Mon Oct 15 14:08:40 2001
+++ linux/drivers/usb/uhci.c	Mon Oct 15 14:14:12 2001
@@ -796,7 +796,7 @@
 	if (status & TD_CTRL_NAK)			/* NAK */
 		return -ETIMEDOUT;
 	if (status & TD_CTRL_BABBLE)			/* Babble */
-		return -EPIPE;
+		return -EOVERFLOW;
 	if (status & TD_CTRL_DBUFERR)			/* Buffer error */
 		return -ENOSR;
 	if (status & TD_CTRL_STALLED)			/* Stalled */
--- linux/drivers/usb-pre2/usb-uhci.c	Mon Oct 15 14:08:40 2001
+++ linux/drivers/usb/usb-uhci.c	Mon Oct 15 14:14:16 2001
@@ -2193,7 +2193,7 @@
 	if (status & TD_CTRL_NAK)	/* NAK */
 		return -ETIMEDOUT;
 	if (status & TD_CTRL_BABBLE)	/* Babble */
-		return -EPIPE;
+		return -EOVERFLOW;
 	if (status & TD_CTRL_DBUFERR)	/* Buffer error */
 		return -ENOSR;
 	if (status & TD_CTRL_STALLED)	/* Stalled */