Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc4b1f48 authored by Johan Hovold's avatar Johan Hovold
Browse files

Revert "USB: serial: make bulk_out_size a lower limit" 



This reverts commit 5083fd7b.

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: 5083fd7b ("USB: serial: make bulk_out_size a lower limit")
Reported-by: default avatar"Li, Elvin" <elvin.li@intel.com>
Cc: stable <stable@vger.kernel.org>	# v3.15
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent c517d838

drivers/usb/serial/usb-serial.c

+3 −2
Original line number Diff line number Diff line
@@ -940,8 +940,9 @@ static int usb_serial_probe(struct usb_interface *interface, 
		port = serial->port[i];

		if (kfifo_alloc(&port->write_fifo, PAGE_SIZE, GFP_KERNEL))

			goto probe_error;

		buffer_size = max_t(int, serial->type->bulk_out_size,

						usb_endpoint_maxp(endpoint));

		buffer_size = serial->type->bulk_out_size;

		if (!buffer_size)

			buffer_size = usb_endpoint_maxp(endpoint);

		port->bulk_out_size = buffer_size;

		port->bulk_out_endpointAddress = endpoint->bEndpointAddress;

include/linux/usb/serial.h

+1 −2
Original line number Diff line number Diff line
@@ -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()