korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 14:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

USB: serial: ipaq: use calc_num_endpoints to verify endpoints

Browse Source 
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: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2017-03-16 17:13:39 +01:00
parent 2f16621b9a
commit 03b72aecad
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/usb/serial/ipaq.c
View File

@ -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