Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (48 commits)
  USB: otg: fix module reinsert issue
  USB: handle zero-length usbfs submissions correctly
  USB: EHCI: report actual_length for iso transfers
  USB: option: remove unnecessary and erroneous code
  USB: cypress_m8: remove invalid Clear-Halt
  USB: musb_host: undo incorrect change in musb_advance_schedule()
  USB: fix LANGID=0 regression
  USB: serial: sierra driver id_table additions
  USB serial: Add ID for Turtelizer, an FT2232L-based JTAG/RS-232 adapter.
  USB: fix race leading to a write after kfree in usbfs
  USB: Sierra: fix oops upon device close
  USB: option.c: add A-Link 3GU device id
  USB: Serial: Add support for Arkham Technology adapters
  USB: Fix option_ms regression in 2.6.31-rc2
  USB: gadget audio: select SND_PCM
  USB: ftdi: support NDI devices
  Revert USB: usbfs: deprecate and hide option for !embedded
  USB: usb.h: fix kernel-doc notation
  USB: RNDIS gadget, fix issues talking from PXA
  USB: serial: FTDI with product code FB80 and vendor id 0403
  ...

1 files changed, 23 insertions, 8 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 3f1045993474..5b15d9d8896b 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -387,6 +387,7 @@ static void acm_rx_tasklet(unsigned long _acm)
         struct acm_ru *rcv;
         unsigned long flags;
         unsigned char throttled;
+        struct usb_host_endpoint *ep;
 
         dbg("Entering acm_rx_tasklet");
 
@@ -462,11 +463,20 @@ urbs:
 
                 rcv->buffer = buf;
 
-                usb_fill_bulk_urb(rcv->urb, acm->dev,
-                                  acm->rx_endpoint,
-                                  buf->base,
-                                  acm->readsize,
-                                  acm_read_bulk, rcv);
+                ep = (usb_pipein(acm->rx_endpoint) ? acm->dev->ep_in : acm->dev->ep_out)
+                                [usb_pipeendpoint(acm->rx_endpoint)];
+                if (usb_endpoint_xfer_int(&ep->desc))
+                        usb_fill_int_urb(rcv->urb, acm->dev,
+                                         acm->rx_endpoint,
+                                         buf->base,
+                                         acm->readsize,
+                                         acm_read_bulk, rcv, ep->desc.bInterval);
+                else
+                        usb_fill_bulk_urb(rcv->urb, acm->dev,
+                                          acm->rx_endpoint,
+                                          buf->base,
+                                          acm->readsize,
+                                          acm_read_bulk, rcv);
                 rcv->urb->transfer_dma = buf->dma;
                 rcv->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
@@ -1227,9 +1237,14 @@ made_compressed_probe:
                         goto alloc_fail7;
                 }
 
-                usb_fill_bulk_urb(snd->urb, usb_dev,
-                        usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress),
-                        NULL, acm->writesize, acm_write_bulk, snd);
+                if (usb_endpoint_xfer_int(epwrite))
+                        usb_fill_int_urb(snd->urb, usb_dev,
+                                usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress),
+                                NULL, acm->writesize, acm_write_bulk, snd, epwrite->bInterval);
+                else
+                        usb_fill_bulk_urb(snd->urb, usb_dev,
+                                usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress),
+                                NULL, acm->writesize, acm_write_bulk, snd);
                 snd->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
                 snd->instance = acm;
         }