diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-02-27 12:13:50 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-02-27 12:13:50 +0800 |
commit | 0dbbc74421d25e7d490d7426b38f7942011deb4d (patch) | |
tree | 26a9d5968d5d0cd6c8b6fd8dee5cc3fb199e1e6e /drivers/usb/serial/mos7840.c | |
parent | e2a316c741e51ce220003d49ea30e25468ca3b0f (diff) | |
parent | 3737a5f7223464efed3b0a9da2b045dae28d3a53 (diff) |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-androidlsk-v4.9-18.05-androidlsk-v4.9-18.03-androidlsk-v4.9-18.02-androidlsk-v4.9-17.11-androidlsk-v4.9-17.09-androidlsk-v4.9-17.08-androidlsk-v4.9-17.06-android
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
-rw-r--r-- | drivers/usb/serial/mos7840.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 4f9af47e6a29..5c4fc3abf6a7 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1024,6 +1024,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) * (can't set it up in mos7840_startup as the structures * * were not set up at that time.) */ if (port0->open_ports == 1) { + /* FIXME: Buffer never NULL, so URB is not submitted. */ if (serial->port[0]->interrupt_in_buffer == NULL) { /* set up interrupt urb */ usb_fill_int_urb(serial->port[0]->interrupt_in_urb, @@ -2119,7 +2120,8 @@ static int mos7840_calc_num_ports(struct usb_serial *serial) static int mos7840_attach(struct usb_serial *serial) { if (serial->num_bulk_in < serial->num_ports || - serial->num_bulk_out < serial->num_ports) { + serial->num_bulk_out < serial->num_ports || + serial->num_interrupt_in < 1) { dev_err(&serial->interface->dev, "missing endpoints\n"); return -ENODEV; } |