summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-19 09:21:08 +0100
committerBen Hutchings <ben@decadent.org.uk>2013-03-27 02:41:22 +0000
commit06b72f0486459015c1cb24828e100df7516dd0ee (patch)
tree4629e824cbcf5e7c28e2b03447e2bfe2e604dce2
parent6092e4b9e78afcaf0aee456cc4878e499dc0bb34 (diff)
downloadlwn-06b72f0486459015c1cb24828e100df7516dd0ee.tar.gz
lwn-06b72f0486459015c1cb24828e100df7516dd0ee.zip
USB: io_ti: fix get_icount for two port adapters
commit 5492bf3d5655b4954164f69c02955a7fca267611 upstream. Add missing get_icount field to two-port driver. The two-port driver was not updated when switching to the new icount interface in commit 0bca1b913aff ("tty: Convert the USB drivers to the new icount interface"). Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/usb/serial/io_ti.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 3de751d29cbb..1f145bfb7f41 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2796,6 +2796,7 @@ static struct usb_serial_driver edgeport_2port_device = {
.set_termios = edge_set_termios,
.tiocmget = edge_tiocmget,
.tiocmset = edge_tiocmset,
+ .get_icount = edge_get_icount,
.write = edge_write,
.write_room = edge_write_room,
.chars_in_buffer = edge_chars_in_buffer,