From 399d99ac6afb62d543f9aab5c7c301b70dfafc36 Mon Sep 17 00:00:00 2001 From: "csanchez@neurowork.net" Date: Tue, 25 May 2010 10:53:17 -0500 Subject: [PATCH] --- yaml --- r: 207956 b: refs/heads/master c: cd62aced31dee9a9a8e63da7bd564911891b3665 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/endpoint.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 106bdc793203..16428993078b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16be57259f4e664e4e423caa896963de1b7b8d14 +refs/heads/master: cd62aced31dee9a9a8e63da7bd564911891b3665 diff --git a/trunk/drivers/usb/core/endpoint.c b/trunk/drivers/usb/core/endpoint.c index 4f84a41ee7a8..3788e738e265 100644 --- a/trunk/drivers/usb/core/endpoint.c +++ b/trunk/drivers/usb/core/endpoint.c @@ -96,16 +96,21 @@ static ssize_t show_ep_interval(struct device *dev, switch (usb_endpoint_type(ep->desc)) { case USB_ENDPOINT_XFER_CONTROL: - if (ep->udev->speed == USB_SPEED_HIGH) /* uframes per NAK */ + if (ep->udev->speed == USB_SPEED_HIGH) + /* uframes per NAK */ interval = ep->desc->bInterval; break; + case USB_ENDPOINT_XFER_ISOC: interval = 1 << (ep->desc->bInterval - 1); break; + case USB_ENDPOINT_XFER_BULK: - if (ep->udev->speed == USB_SPEED_HIGH && !in) /* uframes per NAK */ + if (ep->udev->speed == USB_SPEED_HIGH && !in) + /* uframes per NAK */ interval = ep->desc->bInterval; break; + case USB_ENDPOINT_XFER_INT: if (ep->udev->speed == USB_SPEED_HIGH) interval = 1 << (ep->desc->bInterval - 1);