aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/isicom.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/isicom.c')
-rw-r--r--drivers/char/isicom.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index a69e4bb91ad4..6812fda20953 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1012,6 +1012,22 @@ static void isicom_shutdown_port(struct isi_port *port)
1012 } 1012 }
1013} 1013}
1014 1014
1015static void isicom_flush_buffer(struct tty_struct *tty)
1016{
1017 struct isi_port *port = tty->driver_data;
1018 struct isi_board *card = port->card;
1019 unsigned long flags;
1020
1021 if (isicom_paranoia_check(port, tty->name, "isicom_flush_buffer"))
1022 return;
1023
1024 spin_lock_irqsave(&card->card_lock, flags);
1025 port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
1026 spin_unlock_irqrestore(&card->card_lock, flags);
1027
1028 tty_wakeup(tty);
1029}
1030
1015static void isicom_close(struct tty_struct *tty, struct file *filp) 1031static void isicom_close(struct tty_struct *tty, struct file *filp)
1016{ 1032{
1017 struct isi_port *port = tty->driver_data; 1033 struct isi_port *port = tty->driver_data;
@@ -1065,8 +1081,7 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
1065 isicom_shutdown_port(port); 1081 isicom_shutdown_port(port);
1066 spin_unlock_irqrestore(&card->card_lock, flags); 1082 spin_unlock_irqrestore(&card->card_lock, flags);
1067 1083
1068 if (tty->driver->flush_buffer) 1084 isicom_flush_buffer(tty);
1069 tty->driver->flush_buffer(tty);
1070 tty_ldisc_flush(tty); 1085 tty_ldisc_flush(tty);
1071 1086
1072 spin_lock_irqsave(&card->card_lock, flags); 1087 spin_lock_irqsave(&card->card_lock, flags);
@@ -1447,22 +1462,6 @@ static void isicom_hangup(struct tty_struct *tty)
1447 wake_up_interruptible(&port->open_wait); 1462 wake_up_interruptible(&port->open_wait);
1448} 1463}
1449 1464
1450/* flush_buffer et all */
1451static void isicom_flush_buffer(struct tty_struct *tty)
1452{
1453 struct isi_port *port = tty->driver_data;
1454 struct isi_board *card = port->card;
1455 unsigned long flags;
1456
1457 if (isicom_paranoia_check(port, tty->name, "isicom_flush_buffer"))
1458 return;
1459
1460 spin_lock_irqsave(&card->card_lock, flags);
1461 port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
1462 spin_unlock_irqrestore(&card->card_lock, flags);
1463
1464 tty_wakeup(tty);
1465}
1466 1465
1467/* 1466/*
1468 * Driver init and deinit functions 1467 * Driver init and deinit functions