13 files changed, 19 insertions, 23 deletions

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");