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

Commit 03b72aec authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: ipaq: use calc_num_endpoints to verify endpoints 



Use the calc_num_ports rather than attach callback to determine which
interface to bind to in order to avoid allocating port-resources for
interfaces that won't be bound.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 2f16621b

drivers/usb/serial/ipaq.c

+10 −8
Original line number Diff line number Diff line
@@ -574,20 +574,22 @@ static int ipaq_calc_num_ports(struct usb_serial *serial, 
		ipaq_num_ports = 2;

	}



	/*

	 * Some of the devices in ipaq_id_table[] are composite, and we

	 * shouldn't bind to all the interfaces.  This test will rule out

	 * some obviously invalid possibilities.

	 */

	if (epds->num_bulk_in < ipaq_num_ports ||

			epds->num_bulk_out < ipaq_num_ports) {

		return -ENODEV;

	}



	return ipaq_num_ports;

}





static int ipaq_startup(struct usb_serial *serial)

{

	/* Some of the devices in ipaq_id_table[] are composite, and we

	 * shouldn't bind to all the interfaces.  This test will rule out

	 * some obviously invalid possibilities.

	 */

	if (serial->num_bulk_in < serial->num_ports ||

			serial->num_bulk_out < serial->num_ports)

		return -ENODEV;



	if (serial->dev->actconfig->desc.bConfigurationValue != 1) {

		/*

		 * FIXME: HP iPaq rx3715, possibly others, have 1 config that