24 files changed, 48 insertions, 60 deletions

diff --git a/Documentation/usb/error-codes.txt b/Documentation/usb/error-codes.txt
index 867f4c38f356..39c68f8c4e6c 100644
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
@@ -98,13 +98,13 @@ one or more packets could finish before an error stops further endpoint I/O.
                         error, a failure to respond (often caused by
                         device disconnect), or some other fault.
 
--ETIMEDOUT (**)         No response packet received within the prescribed
+-ETIME (**)             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.
+-ETIMEDOUT              Synchronous USB message functions use this code
+                        to indicate timeout expired before the transfer
+                        completed, and no other error was reported by HC.
 
 -EPIPE (**)             Endpoint stalled.  For non-control endpoints,
                         reset this status with usb_clear_halt().
@@ -163,6 +163,3 @@ 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.
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 3845defd4901..5cfbe6a38010 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -192,7 +192,7 @@ static char *get_usb_statmsg(int status)
                 return "bit stuffing error, timeout, or unknown USB error";
         case -EILSEQ:
                 return "CRC mismatch, timeout, or unknown USB error";
-        case -ETIMEDOUT:
+        case -ETIME:
                 return "timed out";
         case -EPIPE:
                 return "endpoint stalled";
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index ec52c1a7c22a..6349367ed480 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -137,11 +137,11 @@ static struct hfcusb_symbolic_list urb_errlist[] = {
         {-ENXIO, "URB already queued"},
         {-EFBIG, "Too much ISO frames requested"},
         {-ENOSR, "Buffer error (overrun)"},
-        {-EPIPE, "Specified endpoint is stalled (device not responding)"},
+        {-EPIPE, "Specified endpoint is stalled"},
         {-EOVERFLOW, "Babble (bad cable?)"},
         {-EPROTO, "Bit-stuff error (bad cable?)"},
-        {-EILSEQ, "CRC/Timeout"},
-        {-ETIMEDOUT, "NAK (device does not respond)"},
+        {-EILSEQ, "CRC or missing token"},
+        {-ETIME, "Device did not respond"},
         {-ESHUTDOWN, "Device unplugged"},
         {-1, NULL}
 };
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 9002f35aa952..88b283731bb8 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -80,7 +80,6 @@ static void dvb_usb_urb_complete(struct urb *urb, struct pt_regs *ptregs)
 
         switch (urb->status) {
                 case 0:         /* success */
-                case -ETIMEDOUT:    /* NAK */
                         break;
                 case -ECONNRESET:   /* kill */
                 case -ENOENT:
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 6c1cb770bcf5..c9d663549dff 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -215,7 +215,7 @@ static void ttusb_dec_handle_irq( struct urb *urb, struct pt_regs *regs)
                 case -ECONNRESET:
                 case -ENOENT:
                 case -ESHUTDOWN:
-                case -ETIMEDOUT:
+                case -ETIME:
                         /* this urb is dead, cleanup */
                         dprintk("%s:urb shutting down with status: %d\n",
                                         __FUNCTION__, urb->status);
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 1b07a61c2ebb..5d8cd283fcd8 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -301,10 +301,11 @@ static struct symbolic_list senlist[] = {
 static struct symbolic_list urb_errlist[] = {
         { -ENOSR,       "Buffer error (overrun)" },
         { -EPIPE,       "Stalled (device not responding)" },
-        { -EOVERFLOW,   "Babble (bad cable?)" },
+        { -EOVERFLOW,   "Babble (device sends too much data)" },
         { -EPROTO,      "Bit-stuff error (bad cable?)" },
-        { -EILSEQ,      "CRC/Timeout" },
-        { -ETIMEDOUT,   "NAK (device does not respond)" },
+        { -EILSEQ,      "CRC/Timeout (bad cable?)" },
+        { -ETIME,       "Device does not respond to token" },
+        { -ETIMEDOUT,   "Device does not respond to command" },
         { -1, NULL }
 };
 
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index d4703944df9c..53c4b5790d5c 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -711,7 +711,7 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)
                         case -EOVERFLOW:        errmsg = "Babble (bad cable?)"; break;
                         case -EPROTO:           errmsg = "Bit-stuff error (bad cable?)"; break;
                         case -EILSEQ:           errmsg = "CRC/Timeout (could be anything)"; break;
-                        case -ETIMEDOUT:        errmsg = "NAK (device does not respond)"; break;
+                        case -ETIME:            errmsg = "Device does not respond"; break;
                 }
                 PWC_DEBUG_FLOW("pwc_isoc_handler() called with status %d [%s].\n", urb->status, errmsg);
                 /* Give up after a number of contiguous errors on the USB bus.
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 20f211b55ad4..2912326a5aef 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -586,15 +586,14 @@ static struct w9968cf_symbolic_list urb_errlist[] = {
         { -EFBIG,     "Too much ISO frames requested" },
         { -ENOSR,     "Buffer error (overrun)" },
         { -EPIPE,     "Specified endpoint is stalled (device not responding)"},
-        { -EOVERFLOW, "Babble (bad cable?)" },
+        { -EOVERFLOW, "Babble (too much data)" },
         { -EPROTO,    "Bit-stuff error (bad cable?)" },
         { -EILSEQ,    "CRC/Timeout" },
-        { -ETIMEDOUT, "NAK (device does not respond)" },
+        { -ETIME,     "Device does not respond to token" },
+        { -ETIMEDOUT, "Device does not respond to command" },
         { -1, NULL }
 };
 
-
-
 /****************************************************************************
  * Memory management functions                                              *
  ****************************************************************************/
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 2a0d538b387f..383cef1f5999 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -671,10 +671,8 @@ static void irda_usb_net_timeout(struct net_device *netdev)
                          * Jean II */
                         done = 1;
                         break;
-                case -ECONNABORTED:             /* -103 */
-                case -ECONNRESET:               /* -104 */
-                case -ETIMEDOUT:                /* -110 */
-                case -ENOENT:                   /* -2 (urb unlinked by us)  */
+                case -ECONNRESET:
+                case -ENOENT:                   /* urb unlinked by us */
                 default:                        /* ??? - Play safe */
                         urb->status = 0;
                         netif_wake_queue(self->netdev);
@@ -712,10 +710,8 @@ static void irda_usb_net_timeout(struct net_device *netdev)
                          * Jean II */
                         done = 1;
                         break;
-                case -ECONNABORTED:             /* -103 */
-                case -ECONNRESET:               /* -104 */
-                case -ETIMEDOUT:                /* -110 */
-                case -ENOENT:                   /* -2 (urb unlinked by us)  */
+                case -ECONNRESET:
+                case -ENOENT:                   /* urb unlinked by us */
                 default:                        /* ??? - Play safe */
                         if(skb != NULL) {
                                 dev_kfree_skb_any(skb);
@@ -845,14 +841,14 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
                         self->stats.rx_crc_errors++;    
                         /* Also precursor to a hot-unplug on UHCI. */
                         /* Fallthrough... */
-                case -ECONNRESET:               /* -104 */
+                case -ECONNRESET:
                         /* Random error, if I remember correctly */
                         /* uhci_cleanup_unlink() is going to kill the Rx
                          * URB just after we return. No problem, at this
                          * point the URB will be idle ;-) - Jean II */
-                case -ESHUTDOWN:                /* -108 */
+                case -ESHUTDOWN:
                         /* That's usually a hot-unplug. Submit will fail... */
-                case -ETIMEDOUT:                /* -110 */
+                case -ETIME:
                         /* Usually precursor to a hot-unplug on OHCI. */
                 default:
                         self->stats.rx_errors++;
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index c52e9bcf8d02..f50ec10675d1 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -119,7 +119,7 @@ static void zd1201_usbfree(struct urb *urb, struct pt_regs *regs)
         switch(urb->status) {
                 case -EILSEQ:
                 case -ENODEV:
-                case -ETIMEDOUT:
+                case -ETIME:
                 case -ENOENT:
                 case -EPIPE:
                 case -EOVERFLOW:
@@ -201,7 +201,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
         switch(urb->status) {
                 case -EILSEQ:
                 case -ENODEV:
-                case -ETIMEDOUT:
+                case -ETIME:
                 case -ENOENT:
                 case -EPIPE:
                 case -EOVERFLOW:
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h
index a1b7c3813d3a..b91e2edd9c5c 100644
--- a/drivers/usb/host/isp116x.h
+++ b/drivers/usb/host/isp116x.h
@@ -233,7 +233,7 @@ static const int cc_to_error[16] = {
         /* Bit Stuff  */ -EPROTO,
         /* Data Togg  */ -EILSEQ,
         /* Stall      */ -EPIPE,
-        /* DevNotResp */ -ETIMEDOUT,
+        /* DevNotResp */ -ETIME,
         /* PIDCheck   */ -EPROTO,
         /* UnExpPID   */ -EPROTO,
         /* DataOver   */ -EOVERFLOW,
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 650d1bf21c1d..93fdc3c35341 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -159,7 +159,7 @@ static const int cc_to_error [16] = {
         /* Bit Stuff  */               -EPROTO,
         /* Data Togg  */               -EILSEQ,
         /* Stall      */               -EPIPE,
-        /* DevNotResp */               -ETIMEDOUT,
+        /* DevNotResp */               -ETIME,
         /* PIDCheck   */               -EPROTO,
         /* UnExpPID   */               -EPROTO,
         /* DataOver   */               -EOVERFLOW,
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 8c17da37600b..3a586aab3939 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -597,7 +597,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank, struct pt_regs *regs)
         /* error? retry, until "3 strikes" */
         } else if (++ep->error_count >= 3) {
                 if (status & SL11H_STATMASK_TMOUT)
-                        urbstat = -ETIMEDOUT;
+                        urbstat = -ETIME;
                 else if (status & SL11H_STATMASK_OVF)
                         urbstat = -EOVERFLOW;
                 else
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index fc5b662ea177..2a3e9e9b4b3d 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1023,7 +1023,8 @@ static void hid_irq_in(struct urb *urb, struct pt_regs *regs)
                         return;
                 case -EILSEQ:           /* protocol error or unplug */
                 case -EPROTO:           /* protocol error or unplug */
-                case -ETIMEDOUT:        /* NAK */
+                case -ETIME:            /* protocol error or unplug */
+                case -ETIMEDOUT:        /* Should never happen, but... */
                         clear_bit(HID_IN_RUNNING, &hid->iofl);
                         hid_io_error(hid);
                         return;
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 86acb5f1907a..61966d719ca3 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -87,7 +87,7 @@ static void itmtouch_irq(struct urb *urb, struct pt_regs *regs)
         case 0:
                 /* success */
                 break;
-        case -ETIMEDOUT:
+        case -ETIME:
                 /* this urb is timing out */
                 dbg("%s - urb timed out - was the device unplugged?",
                     __FUNCTION__);
diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c
index a9ccda8810e0..5dce951f2751 100644
--- a/drivers/usb/input/mtouchusb.c
+++ b/drivers/usb/input/mtouchusb.c
@@ -107,7 +107,7 @@ static void mtouchusb_irq(struct urb *urb, struct pt_regs *regs)
         case 0:
                 /* success */
                 break;
-        case -ETIMEDOUT:
+        case -ETIME:
                 /* this urb is timing out */
                 dbg("%s - urb timed out - was the device unplugged?",
                     __FUNCTION__);
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c
index 0149043ffb97..30b9f820e7a8 100644
--- a/drivers/usb/input/touchkitusb.c
+++ b/drivers/usb/input/touchkitusb.c
@@ -201,7 +201,7 @@ static void touchkit_irq(struct urb *urb, struct pt_regs *regs)
         case 0:
                 /* success */
                 break;
-        case -ETIMEDOUT:
+        case -ETIME:
                 /* this urb is timing out */
                 dbg("%s - urb timed out - was the device unplugged?",
                     __FUNCTION__);
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index a1be7840ea02..4640d1000d83 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -508,7 +508,7 @@ static void usbtouch_irq(struct urb *urb, struct pt_regs *regs)
         case 0:
                 /* success */
                 break;
-        case -ETIMEDOUT:
+        case -ETIME:
                 /* this urb is timing out */
                 dbg("%s - urb timed out - was the device unplugged?",
                     __FUNCTION__);
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 4a329d8488b7..4fd2110b3411 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -806,7 +806,7 @@ static void auerbuf_releasebuf( pauerbuf_t bp)
 0               Initial, OK
 -EINPROGRESS    during submission until end
 -ENOENT         if urb is unlinked
--ETIMEDOUT      Transfer timed out, NAK
+-ETIME          Device did not respond
 -ENOMEM         Memory Overflow
 -ENODEV         Specified USB-device or bus doesn't exist
 -ENXIO          URB already queued
@@ -832,7 +832,7 @@ static int auerswald_status_retry (int status)
 {
         switch (status) {
         case 0:
-        case -ETIMEDOUT:
+        case -ETIME:
         case -EOVERFLOW:
         case -EAGAIN:
         case -EPIPE:
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c
index ab21f960d255..b8e25af13f02 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
@@ -619,7 +619,7 @@ static void read_bulk_callback(struct urb *urb, struct pt_regs *regs)
         switch (urb->status) {
         case 0:
                 break;
-        case -ETIMEDOUT:
+        case -ETIME:
                 if (netif_msg_rx_err(pegasus))
                         pr_debug("%s: reset MAC\n", net->name);
                 pegasus->flags &= ~PEGASUS_RX_BUSY;
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index a72685b96061..2364c2099387 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -438,7 +438,7 @@ static void read_bulk_callback(struct urb *urb, struct pt_regs *regs)
                 break;
         case -ENOENT:
                 return; /* the urb is in unlink state */
-        case -ETIMEDOUT:
+        case -ETIME:
                 warn("may be reset is needed?..");
                 goto goon;
         default:
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 8e8e74d40530..98a522f1e264 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -425,9 +425,9 @@ static void rx_complete (struct urb *urb, struct pt_regs *regs)
             // we get controller i/o faults during khubd disconnect() delays.
             // throttle down resubmits, to avoid log floods; just temporarily,
             // so we still recover when the fault isn't a khubd delay.
-            case -EPROTO:               // ehci
-            case -ETIMEDOUT:            // ohci
-            case -EILSEQ:               // uhci
+            case -EPROTO:
+            case -ETIME:
+            case -EILSEQ:
                 dev->stats.rx_errors++;
                 if (!timer_pending (&dev->delay)) {
                         mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES);
@@ -821,9 +821,9 @@ static void tx_complete (struct urb *urb, struct pt_regs *regs)
 
                 // like rx, tx gets controller i/o faults during khubd delays
                 // and so it uses the same throttling mechanism.
-                case -EPROTO:           // ehci
-                case -ETIMEDOUT:        // ohci
-                case -EILSEQ:           // uhci
+                case -EPROTO:
+                case -ETIME:
+                case -EILSEQ:
                         if (!timer_pending (&dev->delay)) {
                                 mod_timer (&dev->delay,
                                         jiffies + THROTTLE_JIFFIES);
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index d6acc92a4ae3..f23514c4e649 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -294,11 +294,6 @@ static int interpret_urb_result(struct us_data *us, unsigned int pipe,
                         return USB_STOR_XFER_ERROR;
                 return USB_STOR_XFER_STALLED;
 
-        /* timeout or excessively long NAK */
-        case -ETIMEDOUT:
-                US_DEBUGP("-- timeout or NAK\n");
-                return USB_STOR_XFER_ERROR;
-
         /* babble - the device tried to send more than we wanted to read */
         case -EOVERFLOW:
                 US_DEBUGP("-- babble\n");
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 5105b6b05748..abe29dadd979 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -181,9 +181,9 @@ static int snd_usbmidi_urb_error(int status)
         case -ENODEV:
                 return -ENODEV;
         /* errors that might occur during unplugging */
-        case -EPROTO:    /* EHCI */
-        case -ETIMEDOUT: /* OHCI */
-        case -EILSEQ:    /* UHCI */
+        case -EPROTO:
+        case -ETIME:
+        case -EILSEQ:
                 return -EIO;
         default:
                 snd_printk(KERN_ERR "urb status %d\n", status);