aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/omninet.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-05-31 12:02:43 +0800
committerAlex Shi <alex.shi@linaro.org>2017-05-31 12:02:43 +0800
commita898540914d4136f29bc738ce593c1c501006f23 (patch)
tree9440b7f76c029143611c89ed919718ba6ff353f4 /drivers/usb/serial/omninet.c
parentd97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff)
parent56d847e3ef9433d7ac92376e4ba49d3cf3cb70d2 (diff)
Merge tag 'v4.1.40' into linux-linaro-lsk-v4.1lsk-v4.1-17.06lsk-v4.1-17.05linux-linaro-lsk-v4.1
This is the 4.1.40 stable release
Diffstat (limited to 'drivers/usb/serial/omninet.c')
-rw-r--r--drivers/usb/serial/omninet.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index a180b17d2432..76564b3bebb9 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -142,12 +142,6 @@ static int omninet_port_remove(struct usb_serial_port *port)
static int omninet_open(struct tty_struct *tty, struct usb_serial_port *port)
{
- struct usb_serial *serial = port->serial;
- struct usb_serial_port *wport;
-
- wport = serial->port[1];
- tty_port_tty_set(&wport->port, tty);
-
return usb_serial_generic_open(tty, port);
}