Merge tag 'media/v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[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 24a136079d90cb4519f4f943918d4c5e8456af74..1787fa4d9448bfd2428be22cbc9be0aac1f24b1d 100644 (file)
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -550,14 +550,14 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
        unset_locked_termios(&tty->termios, &old_termios, &tty->termios_locked);
 
        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);