USB: serial: mos7720: simplify endpoint check
authorJohan Hovold <johan@kernel.org>
Thu, 2 Mar 2017 11:51:27 +0000 (12:51 +0100)
committerJohan Hovold <johan@kernel.org>
Thu, 16 Mar 2017 09:33:44 +0000 (10:33 +0100)
Simplify the endpoint sanity check by letting core verify that the
required endpoints are present.

Note that the driver expects two bulk-endpoint pairs also for mcs7715
devices for which only one serial port is registered.

Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/mos7720.c

index f075121c6e32329d136935d2d1d56ae8b49c784f..df45ebad5f6f80ff425204f2192ffce73d315095 100644 (file)
@@ -1900,11 +1900,6 @@ static int mos7720_startup(struct usb_serial *serial)
        u16 product;
        int ret_val;
 
-       if (serial->num_bulk_in < 2 || serial->num_bulk_out < 2) {
-               dev_err(&serial->interface->dev, "missing bulk endpoints\n");
-               return -ENODEV;
-       }
-
        product = le16_to_cpu(serial->dev->descriptor.idProduct);
        dev = serial->dev;
 
@@ -2039,6 +2034,8 @@ static struct usb_serial_driver moschip7720_2port_driver = {
        },
        .description            = "Moschip 2 port adapter",
        .id_table               = id_table,
+       .num_bulk_in            = 2,
+       .num_bulk_out           = 2,
        .calc_num_ports         = mos77xx_calc_num_ports,
        .open                   = mos7720_open,
        .close                  = mos7720_close,