Merge branch 'drm-sti-next-add-dvo' of git://git.linaro.org/people/benjamin.gaignard...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / tty_ioctl.c

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 62380ccf70fb469f3e3c676452819ecfdf6ff4b5..1787fa4d9448bfd2428be22cbc9be0aac1f24b1d 100644 (file)
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -524,9 +524,8 @@ EXPORT_SYMBOL(tty_termios_hw_change);
  *     @tty: tty to update
  *     @new_termios: desired new value
  *
- *     Perform updates to the termios values set on this terminal. There
- *     is a bit of layering violation here with n_tty in terms of the
- *     internal knowledge of this function.
+ *     Perform updates to the termios values set on this terminal.
+ *     A master pty's termios should never be set.
  *
  *     Locking: termios_rwsem
  */
@@ -535,8 +534,9 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
 {
        struct ktermios old_termios;
        struct tty_ldisc *ld;
-       unsigned long flags;
 
+       WARN_ON(tty->driver->type == TTY_DRIVER_TYPE_PTY &&
+               tty->driver->subtype == PTY_TYPE_MASTER);
        /*
         *      Perform the actual termios internal changes under lock.
         */
@@ -549,41 +549,15 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
        tty->termios = *new_termios;
        unset_locked_termios(&tty->termios, &old_termios, &tty->termios_locked);
 
-       /* See if packet mode change of state. */
-       if (tty->link && tty->link->packet) {
-               int extproc = (old_termios.c_lflag & EXTPROC) |
-                               (tty->termios.c_lflag & EXTPROC);
-               int old_flow = ((old_termios.c_iflag & IXON) &&
-                               (old_termios.c_cc[VSTOP] == '\023') &&
-                               (old_termios.c_cc[VSTART] == '\021'));
-               int new_flow = (I_IXON(tty) &&
-                               STOP_CHAR(tty) == '\023' &&
-                               START_CHAR(tty) == '\021');
-               if ((old_flow != new_flow) || extproc) {
-                       spin_lock_irqsave(&tty->ctrl_lock, flags);
-                       if (old_flow != new_flow) {
-                               tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP);
-                               if (new_flow)
-                                       tty->ctrl_status |= TIOCPKT_DOSTOP;
-                               else
-                                       tty->ctrl_status |= TIOCPKT_NOSTOP;
-                       }
-                       if (extproc)
-                               tty->ctrl_status |= TIOCPKT_IOCTL;
-                       spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                       wake_up_interruptible(&tty->link->read_wait);
-               }
-       }
-
        if (tty->ops->set_termios)
-               (*tty->ops->set_termios)(tty, &old_termios);
+               tty->ops->set_termios(tty, &old_termios);
        else
                tty_termios_copy_hw(&tty->termios, &old_termios);
 
        ld = tty_ldisc_ref(tty);
        if (ld != NULL) {
                if (ld->ops->set_termios)
-                       (ld->ops->set_termios)(tty, &old_termios);
+                       ld->ops->set_termios(tty, &old_termios);
                tty_ldisc_deref(ld);
        }
        up_write(&tty->termios_rwsem);