aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/amiserial.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/amiserial.c')
-rw-r--r--drivers/char/amiserial.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 8ab75a43231b..a5f3956a5971 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1505,8 +1505,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
1505 rs_wait_until_sent(tty, info->timeout); 1505 rs_wait_until_sent(tty, info->timeout);
1506 } 1506 }
1507 shutdown(info); 1507 shutdown(info);
1508 if (tty->driver->flush_buffer) 1508 rs_flush_buffer(tty);
1509 tty->driver->flush_buffer(tty);
1510 1509
1511 tty_ldisc_flush(tty); 1510 tty_ldisc_flush(tty);
1512 tty->closing = 0; 1511 tty->closing = 0;
@@ -1539,6 +1538,8 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
1539 return; /* Just in case.... */ 1538 return; /* Just in case.... */
1540 1539
1541 orig_jiffies = jiffies; 1540 orig_jiffies = jiffies;
1541
1542 lock_kernel();
1542 /* 1543 /*
1543 * Set the check interval to be 1/5 of the estimated time to 1544 * Set the check interval to be 1/5 of the estimated time to
1544 * send a single character, and make it at least 1. The check 1545 * send a single character, and make it at least 1. The check
@@ -1579,6 +1580,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
1579 break; 1580 break;
1580 } 1581 }
1581 __set_current_state(TASK_RUNNING); 1582 __set_current_state(TASK_RUNNING);
1583 unlock_kernel();
1582#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT 1584#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
1583 printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies); 1585 printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
1584#endif 1586#endif