From: Johan Hovold <johan@kernel.org>
Date: Thu, 16 Mar 2017 16:13:39 +0000 (+0100)
Subject: USB: serial: ipaq: use calc_num_endpoints to verify endpoints
X-Git-Tag: microblaze-4.13-rc1~175^2~9^2~25
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=03b72aecadc2d7b0e8f200ec70b853e39a7e55da;p=linux-2.6-microblaze.git

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: Johan Hovold <johan@kernel.org>
---

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index df5f1a7d7c6f..c638571f0175 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -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