summaryrefslogtreecommitdiffstats
path: root/net/irda/ircomm/ircomm_tty_ioctl.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-06-04 13:35:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 00:50:23 +0200
commit2a0213cb1e1ca6b2838595b0d70f09ecc4953ba9 (patch)
tree800224a7ad6fe994d8a6fb30c5edb5fbd9fa4568 /net/irda/ircomm/ircomm_tty_ioctl.c
parentTTY: ircomm, add tty_port (diff)
downloadlinux-2a0213cb1e1ca6b2838595b0d70f09ecc4953ba9.tar.xz
linux-2a0213cb1e1ca6b2838595b0d70f09ecc4953ba9.zip
TTY: ircomm, use close times from tty_port
Switch to tty_port->close_delay and closing_wait. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Samuel Ortiz <samuel@sortiz.org> Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/irda/ircomm/ircomm_tty_ioctl.c')
-rw-r--r--net/irda/ircomm/ircomm_tty_ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index d0667d68351d..a6d25e37b6b2 100644
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -272,8 +272,8 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
info.line = self->line;
info.flags = self->flags;
info.baud_base = self->settings.data_rate;
- info.close_delay = self->close_delay;
- info.closing_wait = self->closing_wait;
+ info.close_delay = self->port.close_delay;
+ info.closing_wait = self->port.closing_wait;
/* For compatibility */
info.type = PORT_16550A;