USB: serial: mos7720: always require an interrupt endpoint
authorJohan Hovold <johan@kernel.org>
Thu, 16 Mar 2017 16:13:46 +0000 (17:13 +0100)
committerJohan Hovold <johan@kernel.org>
Tue, 28 Mar 2017 09:00:12 +0000 (11:00 +0200)
This driver have treated the interrupt endpoint as optional despite it
always being present (according to the datasheet). Let's consider it
mandatory instead.

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

index eabea0bc1a04ed79a3dce9b69ac5080caa390cf5..b1f6b275e7c11945183152beb16e9fef42fa2586 100644 (file)
@@ -1923,8 +1923,7 @@ static int mos7720_startup(struct usb_serial *serial)
        if (product == MOSCHIP_DEVICE_ID_7715) {
                struct urb *urb = serial->port[0]->interrupt_in_urb;
 
-               if (urb)
-                       urb->complete = mos7715_interrupt_callback;
+               urb->complete = mos7715_interrupt_callback;
 
 #ifdef CONFIG_USB_SERIAL_MOS7715_PARPORT
                ret_val = mos7715_parport_init(serial);
@@ -2025,6 +2024,7 @@ static struct usb_serial_driver moschip7720_2port_driver = {
        .id_table               = id_table,
        .num_bulk_in            = 2,
        .num_bulk_out           = 2,
+       .num_interrupt_in       = 1,
        .calc_num_ports         = mos77xx_calc_num_ports,
        .open                   = mos7720_open,
        .close                  = mos7720_close,