1 files changed, 8 insertions, 20 deletions

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 83bf15a3dda8..2c898c4d6b6a 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -8,6 +8,7 @@
 #include "chan_kern.h"
 #include "irq_kern.h"
 #include "irq_user.h"
+#include "kern_util.h"
 #include "os.h"
 
 #define LINE_BUFSIZE 4096
@@ -48,7 +49,7 @@ static int write_room(struct line *line)
         n = line->head - line->tail;
 
         if (n <= 0)
-                n = LINE_BUFSIZE + n; /* The other case */
+                n += LINE_BUFSIZE; /* The other case */
         return n - 1;
 }
 
@@ -58,17 +59,10 @@ int line_write_room(struct tty_struct *tty)
         unsigned long flags;
         int room;
 
-        if (tty->stopped)
-                return 0;
-
         spin_lock_irqsave(&line->lock, flags);
         room = write_room(line);
         spin_unlock_irqrestore(&line->lock, flags);
 
-        /*XXX: Warning to remove */
-        if (0 == room)
-                printk(KERN_DEBUG "%s: %s: no room left in buffer\n",
-                       __FUNCTION__,tty->name);
         return room;
 }
 
@@ -79,8 +73,7 @@ int line_chars_in_buffer(struct tty_struct *tty)
         int ret;
 
         spin_lock_irqsave(&line->lock, flags);
-
-        /*write_room subtracts 1 for the needed NULL, so we readd it.*/
+        /* write_room subtracts 1 for the needed NULL, so we readd it.*/
         ret = LINE_BUFSIZE - (write_room(line) + 1);
         spin_unlock_irqrestore(&line->lock, flags);
 
@@ -184,10 +177,6 @@ void line_flush_buffer(struct tty_struct *tty)
         unsigned long flags;
         int err;
 
-        /*XXX: copied from line_write, verify if it is correct!*/
-        if (tty->stopped)
-                return;
-
         spin_lock_irqsave(&line->lock, flags);
         err = flush_buffer(line);
         spin_unlock_irqrestore(&line->lock, flags);
@@ -213,9 +202,6 @@ int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
         unsigned long flags;
         int n, ret = 0;
 
-        if (tty->stopped)
-                return 0;
-
         spin_lock_irqsave(&line->lock, flags);
         if (line->head != line->tail)
                 ret = buffer_data(line, buf, len);
@@ -788,9 +774,11 @@ static irqreturn_t winch_interrupt(int irq, void *data)
         tty = winch->tty;
         if (tty != NULL) {
                 line = tty->driver_data;
-                chan_window_size(&line->chan_list, &tty->winsize.ws_row,
-                                 &tty->winsize.ws_col);
-                kill_pgrp(tty->pgrp, SIGWINCH, 1);
+                if (line != NULL) {
+                        chan_window_size(&line->chan_list, &tty->winsize.ws_row,
+                                         &tty->winsize.ws_col);
+                        kill_pgrp(tty->pgrp, SIGWINCH, 1);
+                }
         }
  out:
         if (winch->fd != -1)