diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
| commit | d4b80afbba49e968623330f1336da8c724da8aad (patch) | |
| tree | a9478bd77d8b001a6a7119328d34e9666d7bfe93 /drivers/usb/core/config.c | |
| parent | fcd709ef20a9d83bdb7524d27cd6719dac8690a0 (diff) | |
| parent | 4cea8776571b18db7485930cb422faa739580c8c (diff) | |
Merge branch 'linus' into x86/asm, to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/core/config.c')
| -rw-r--r-- | drivers/usb/core/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 051163189810..15ce4ab11688 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c | |||
| @@ -187,7 +187,7 @@ static const unsigned short high_speed_maxpacket_maxes[4] = { | |||
| 187 | [USB_ENDPOINT_XFER_CONTROL] = 64, | 187 | [USB_ENDPOINT_XFER_CONTROL] = 64, |
| 188 | [USB_ENDPOINT_XFER_ISOC] = 1024, | 188 | [USB_ENDPOINT_XFER_ISOC] = 1024, |
| 189 | [USB_ENDPOINT_XFER_BULK] = 512, | 189 | [USB_ENDPOINT_XFER_BULK] = 512, |
| 190 | [USB_ENDPOINT_XFER_INT] = 1023, | 190 | [USB_ENDPOINT_XFER_INT] = 1024, |
| 191 | }; | 191 | }; |
| 192 | static const unsigned short super_speed_maxpacket_maxes[4] = { | 192 | static const unsigned short super_speed_maxpacket_maxes[4] = { |
| 193 | [USB_ENDPOINT_XFER_CONTROL] = 512, | 193 | [USB_ENDPOINT_XFER_CONTROL] = 512, |