From 1e9f47a487057182852932fae83d676d08d7b4c9 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Mon, 23 Apr 2007 17:30:32 -0400 Subject: [PATCH] --- yaml --- r: 56832 b: refs/heads/master c: 8d062b9a3516c6fbcf749bcc864fdb8b3def1caa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/message.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e7bab9195eb7..900cb0c2c275 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 762e92fa1742007dedd90ff6b1ea74842f0cd34b +refs/heads/master: 8d062b9a3516c6fbcf749bcc864fdb8b3def1caa diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index b7434787db5f..f9fed34bf7d8 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/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);