aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-01-16 05:16:14 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-03 14:44:23 -0800
commit3e517f4b1de4787ecff87a73a9865a0b1aa2b10b (patch)
treed84d2883e865de63f856cade8cca8b45963389eb /drivers/tty
parent91f78f36694b8748fda855b1f9e3614b027a744f (diff)
downloadkernel_samsung_crespo-3e517f4b1de4787ecff87a73a9865a0b1aa2b10b.zip
kernel_samsung_crespo-3e517f4b1de4787ecff87a73a9865a0b1aa2b10b.tar.gz
kernel_samsung_crespo-3e517f4b1de4787ecff87a73a9865a0b1aa2b10b.tar.bz2
68360serial: Plumb in rs_360_get_icount()
Commit 0587102cf9f427c185bfdeb2cef41e13ee0264b1 replaced a direct implementation of SIOCGICOUNT with an implementation of tty_operations::get_icount, but it did not actually set rs_360_ops.get_icount. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: stable@kernel.org [2.6.37] Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/68360serial.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/68360serial.c b/drivers/tty/serial/68360serial.c
index 88b1335..bc21eea 100644
--- a/drivers/tty/serial/68360serial.c
+++ b/drivers/tty/serial/68360serial.c
@@ -2428,6 +2428,7 @@ static const struct tty_operations rs_360_ops = {
/* .read_proc = rs_360_read_proc, */
.tiocmget = rs_360_tiocmget,
.tiocmset = rs_360_tiocmset,
+ .get_icount = rs_360_get_icount,
};
static int __init rs_360_init(void)