1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index feb4ac802a0d..0e2b72f2b887 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -527,10 +527,8 @@ static void do_softint(unsigned long private_)
         if (!tty)
                 return;
 
-        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
+        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event))
                 tty_wakeup(tty);
-                wake_up_interruptible(&tty->write_wait);
-        }
 }
 
 /*
@@ -904,8 +902,7 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count
         if (!info->xmit.buf)
                 return 0;
 
-        local_save_flags(flags);
-        local_irq_disable();
+        local_irq_save(flags);
         while (1) {
                 c = CIRC_SPACE_TO_END(info->xmit.head,
                                       info->xmit.tail,
@@ -968,7 +965,6 @@ static void rs_flush_buffer(struct tty_struct *tty)
         local_irq_save(flags);
         info->xmit.head = info->xmit.tail = 0;
         local_irq_restore(flags);
-        wake_up_interruptible(&tty->write_wait);
         tty_wakeup(tty);
 }