diff options
| author | Johan Hovold <johan@kernel.org> | 2015-02-15 07:57:53 +0300 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2015-02-26 19:02:15 +0300 |
| commit | bc4b1f486fe69b86769e07c8edce472327a8462b (patch) | |
| tree | 778e8c228505ea88a028c695643905918c2b41ce /include/linux/usb/serial.h | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-bc4b1f486fe69b86769e07c8edce472327a8462b.tar.xz | |
Revert "USB: serial: make bulk_out_size a lower limit"
This reverts commit 5083fd7bdfe6760577235a724cf6dccae13652c2.
A bulk-out size smaller than the end-point size is indeed valid. The
offending commit broke the usb-debug driver for EHCI debug devices,
which use 8-byte buffers.
Fixes: 5083fd7bdfe6 ("USB: serial: make bulk_out_size a lower limit")
Reported-by: "Li, Elvin" <elvin.li@intel.com>
Cc: stable <stable@vger.kernel.org> # v3.15
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/linux/usb/serial.h')
| -rw-r--r-- | include/linux/usb/serial.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 9bb547c7bce7..704a1ab8240c 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -190,8 +190,7 @@ static inline void usb_set_serial_data(struct usb_serial *serial, void *data) * @num_ports: the number of different ports this device will have. * @bulk_in_size: minimum number of bytes to allocate for bulk-in buffer * (0 = end-point size) - * @bulk_out_size: minimum number of bytes to allocate for bulk-out buffer - * (0 = end-point size) + * @bulk_out_size: bytes to allocate for bulk-out buffer (0 = end-point size) * @calc_num_ports: pointer to a function to determine how many ports this * device has dynamically. It will be called after the probe() * callback is called, but before attach() |