USB: serial: io_ti: use calc_num_endpoints to verify endpoints

Use the calc_num_ports rather than attach callback to verify that the
required endpoints are present when in download mode.

This avoids allocating port resources for interfaces that won't be bound.

Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index a76b95d32157871f5e2964b629784a7642da8480..989795ab064a7917dd74ef49e9214badfae70cd7 100644 (file)
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2544,19 +2544,30 @@ static void edge_heartbeat_work(struct work_struct *work)
        edge_heartbeat_schedule(serial);
 }
 
-static int edge_startup(struct usb_serial *serial)
+static int edge_calc_num_ports(struct usb_serial *serial,
+                               struct usb_serial_endpoints *epds)
 {
-       struct edgeport_serial *edge_serial;
-       int status;
-       u16 product_id;
+       struct device *dev = &serial->interface->dev;
+       unsigned char num_ports = serial->type->num_ports;
 
        /* Make sure we have the required endpoints when in download mode. */
        if (serial->interface->cur_altsetting->desc.bNumEndpoints > 1) {
-               if (serial->num_bulk_in < serial->num_ports ||
-                               serial->num_bulk_out < serial->num_ports)
+               if (epds->num_bulk_in < num_ports ||
+                               epds->num_bulk_out < num_ports) {
+                       dev_err(dev, "required endpoints missing\n");
                        return -ENODEV;
+               }
        }
 
+       return num_ports;
+}
+
+static int edge_startup(struct usb_serial *serial)
+{
+       struct edgeport_serial *edge_serial;
+       int status;
+       u16 product_id;
+
        /* create our private serial structure */
        edge_serial = kzalloc(sizeof(struct edgeport_serial), GFP_KERNEL);
        if (!edge_serial)
@@ -2741,6 +2752,7 @@ static struct usb_serial_driver edgeport_1port_device = {
        .throttle               = edge_throttle,
        .unthrottle             = edge_unthrottle,
        .attach                 = edge_startup,
+       .calc_num_ports         = edge_calc_num_ports,
        .disconnect             = edge_disconnect,
        .release                = edge_release,
        .port_probe             = edge_port_probe,
@@ -2778,6 +2790,7 @@ static struct usb_serial_driver edgeport_2port_device = {
        .throttle               = edge_throttle,
        .unthrottle             = edge_unthrottle,
        .attach                 = edge_startup,
+       .calc_num_ports         = edge_calc_num_ports,
        .disconnect             = edge_disconnect,
        .release                = edge_release,
        .port_probe             = edge_port_probe,