1 files changed, 20 insertions, 1 deletions

diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 1bdd2bf4f37d..d4b6d64e858b 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -62,7 +62,7 @@ void tty_wait_until_sent(struct tty_struct * tty, long timeout)
         if (!timeout)
                 timeout = MAX_SCHEDULE_TIMEOUT;
         if (wait_event_interruptible_timeout(tty->write_wait,
-                        !tty->driver->chars_in_buffer(tty), timeout))
+                        !tty->driver->chars_in_buffer(tty), timeout) < 0)
                 return;
         if (tty->driver->wait_until_sent)
                 tty->driver->wait_until_sent(tty, timeout);
@@ -365,6 +365,25 @@ void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old)
 EXPORT_SYMBOL(tty_termios_copy_hw);
 
 /**
+ *      tty_termios_hw_change   -       check for setting change
+ *      @a: termios
+ *      @b: termios to compare
+ *
+ *      Check if any of the bits that affect a dumb device have changed
+ *      between the two termios structures, or a speed change is needed.
+ */
+
+int tty_termios_hw_change(struct ktermios *a, struct ktermios *b)
+{
+        if (a->c_ispeed != b->c_ispeed || a->c_ospeed != b->c_ospeed)
+                return 1;
+        if ((a->c_cflag ^ b->c_cflag) & ~(HUPCL | CREAD | CLOCAL))
+                return 1;
+        return 0;
+}
+EXPORT_SYMBOL(tty_termios_hw_change);
+
+/**
  *      change_termios          -       update termios values
  *      @tty: tty to update
  *      @new_termios: desired new value