aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-19 09:21:08 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 12:06:04 -0700
commitd79c29b44524bd1ea8c4ab71a13f33fced3bb17a (patch)
tree134fb61ef299644f211872bb60105e9ac6eed824
parent2f4e0bbf44d7469d6de03155cdf25e3928a93707 (diff)
downloadkernel_samsung_tuna-d79c29b44524bd1ea8c4ab71a13f33fced3bb17a.zip
kernel_samsung_tuna-d79c29b44524bd1ea8c4ab71a13f33fced3bb17a.tar.gz
kernel_samsung_tuna-d79c29b44524bd1ea8c4ab71a13f33fced3bb17a.tar.bz2
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>
-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 8a90d58..bdb44fc 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2793,6 +2793,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,