diff options
| author | Alan Stern | 2007-04-23 23:30:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2007-05-23 08:45:49 +0200 |
| commit | 8d062b9a3516c6fbcf749bcc864fdb8b3def1caa (patch) | |
| tree | af943f9b6774b2c10e0b8d71da9055c8e6beec34 /drivers/usb/core/message.c | |
| parent | USB: New device PID for ftdi_sio driver (diff) | |
| download | kernel-qcow2-linux-8d062b9a3516c6fbcf749bcc864fdb8b3def1caa.tar.gz kernel-qcow2-linux-8d062b9a3516c6fbcf749bcc864fdb8b3def1caa.tar.xz kernel-qcow2-linux-8d062b9a3516c6fbcf749bcc864fdb8b3def1caa.zip | |
USB: set the correct Interrupt interval in usb_bulk_msg
This patch (as902) fixes a mistake I introduced into usb_bulk_msg().
usb_fill_int_urb() already does the bit-shifting calculation for
high-speed Interrupt intervals; it shouldn't be done twice.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Diffstat (limited to 'drivers/usb/core/message.c')
| -rw-r--r-- | drivers/usb/core/message.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index b7434787db5f..f9fed34bf7d8 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -221,15 +221,10 @@ int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe, if ((ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) { - int interval; - - if (usb_dev->speed == USB_SPEED_HIGH) - interval = 1 << min(15, ep->desc.bInterval - 1); - else - interval = ep->desc.bInterval; pipe = (pipe & ~(3 << 30)) | (PIPE_INTERRUPT << 30); usb_fill_int_urb(urb, usb_dev, pipe, data, len, - usb_api_blocking_completion, NULL, interval); + usb_api_blocking_completion, NULL, + ep->desc.bInterval); } else usb_fill_bulk_urb(urb, usb_dev, pipe, data, len, usb_api_blocking_completion, NULL); |