diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
| commit | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (patch) | |
| tree | 1a24a0ad0c33e1d6344d2454b61748afb74a6693 /drivers/usb/serial/omninet.c | |
| parent | cb370744bc101be91a0bc3e9fbdb670ab44df97d (diff) | |
| parent | d9e0350d2575a20ee7783427da9bd6b6107eb983 (diff) | |
Merge tag 'v4.1.39' into linux-linaro-lsk-v4.1lsk-v4.1-17.03
This is the 4.1.39 stable release
Diffstat (limited to 'drivers/usb/serial/omninet.c')
| -rw-r--r-- | drivers/usb/serial/omninet.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index f6c6900bccf0..a180b17d2432 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c @@ -38,6 +38,7 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, const unsigned char *buf, int count); static int omninet_write_room(struct tty_struct *tty); static void omninet_disconnect(struct usb_serial *serial); +static int omninet_attach(struct usb_serial *serial); static int omninet_port_probe(struct usb_serial_port *port); static int omninet_port_remove(struct usb_serial_port *port); @@ -56,6 +57,7 @@ static struct usb_serial_driver zyxel_omninet_device = { .description = "ZyXEL - omni.net lcd plus usb", .id_table = id_table, .num_ports = 1, + .attach = omninet_attach, .port_probe = omninet_port_probe, .port_remove = omninet_port_remove, .open = omninet_open, @@ -104,6 +106,17 @@ struct omninet_data { __u8 od_outseq; /* Sequence number for bulk_out URBs */ }; +static int omninet_attach(struct usb_serial *serial) +{ + /* The second bulk-out endpoint is used for writing. */ + if (serial->num_bulk_out < 2) { + dev_err(&serial->interface->dev, "missing endpoints\n"); + return -ENODEV; + } + + return 0; +} + static int omninet_port_probe(struct usb_serial_port *port) { struct omninet_data *od; |