X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Documentation%2Fusb%2Ferror-codes.txt;h=09754b7d262ae4d9ef79fa5721697e05bf2272c2;hb=f1227cd3e0e73c48b93368800aa89f4341103a00;hp=1e36f1661cd0a6409a00defea1407162a9bdfa61;hpb=340e2b1a4c74f653454348914c408420d5d3c28a;p=linux-2.6.git

diff --git a/Documentation/usb/error-codes.txt b/Documentation/usb/error-codes.txt
index 1e36f1661..09754b7d2 100644
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
@@ -23,9 +23,6 @@ USB-specific:
 
 -ENODEV		specified USB-device or bus doesn't exist
 
--ENOENT		specified interface or endpoint does not exist or
-		is not enabled
-
 -ENXIO		host controller driver does not support queuing of this type
 		of urb.  (treat as a host controller bug.)
 
@@ -86,24 +83,7 @@ one or more packets could finish before an error stops further endpoint I/O.
 			   prescribed bus turn-around time
 			c) unknown USB error 
 
--EILSEQ (*, **)		a) CRC mismatch
-			b) no response packet received within the
-			   prescribed bus turn-around time
-			c) unknown USB error 
-
-			Note that often the controller hardware does not
-			distinguish among cases a), b), and c), so a
-			driver cannot tell whether there was a protocol
-			error, a failure to respond (often caused by
-			device disconnect), or some other fault.
-
--ETIMEDOUT (**)		No response packet received within the prescribed
-			bus turn-around time.  This error may instead be
-			reported as -EPROTO or -EILSEQ.
-
-			Note that the synchronous USB message functions
-			also use this code to indicate timeout expired
-			before the transfer completed.
+-EILSEQ (*, **)		CRC mismatch
 
 -EPIPE (**)		Endpoint stalled.  For non-control endpoints,
 			reset this status with usb_clear_halt().
@@ -124,6 +104,8 @@ one or more packets could finish before an error stops further endpoint I/O.
 			specified buffer, and URB_SHORT_NOT_OK was set in
 			urb->transfer_flags.
 
+-ETIMEDOUT (**)		transfer timed out, NAK
+
 -ENODEV			Device was removed.  Often preceded by a burst of
 			other errors, since the hub driver does't detect
 			device removal events immediately.
@@ -161,7 +143,4 @@ usb_register():
 usb_get_*/usb_set_*():
 usb_control_msg():
 usb_bulk_msg():
--ETIMEDOUT		Timeout expired before the transfer completed.
-			In the future this code may change to -ETIME,
-			whose definition is a closer match to this sort
-			of error.
+			All USB errors (submit/status) can occur