diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /drivers/usb/core/urb.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/usb/core/urb.c')
| -rw-r--r-- | drivers/usb/core/urb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index 27080561a1c2..45a32dadb406 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c | |||
| @@ -453,6 +453,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) | |||
| 453 | if (urb->interval > (1 << 15)) | 453 | if (urb->interval > (1 << 15)) |
| 454 | return -EINVAL; | 454 | return -EINVAL; |
| 455 | max = 1 << 15; | 455 | max = 1 << 15; |
| 456 | break; | ||
| 456 | case USB_SPEED_WIRELESS: | 457 | case USB_SPEED_WIRELESS: |
| 457 | if (urb->interval > 16) | 458 | if (urb->interval > 16) |
| 458 | return -EINVAL; | 459 | return -EINVAL; |