Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207956
b: refs/heads/master
c: cd62ace
h: refs/heads/master
v: v3
  • Loading branch information
csanchez@neurowork.net authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 85845bf commit 399d99a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 16be57259f4e664e4e423caa896963de1b7b8d14
refs/heads/master: cd62aced31dee9a9a8e63da7bd564911891b3665
9 changes: 7 additions & 2 deletions trunk/drivers/usb/core/endpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 399d99a

Please sign in to comment.