Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[pandora-kernel.git] / drivers / char / tty_ioctl.c

diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 0ffba4e..dee47f4 100644 (file)
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -399,23 +399,27 @@ static int set_termios(struct tty_struct * tty, void __user *arg, int opt)
        if (retval)
                return retval;
 
+       memcpy(&tmp_termios, tty->termios, sizeof(struct ktermios));
+
        if (opt & TERMIOS_TERMIO) {
-               memcpy(&tmp_termios, tty->termios, sizeof(struct ktermios));
                if (user_termio_to_kernel_termios(&tmp_termios,
                                                (struct termio __user *)arg))
                        return -EFAULT;
 #ifdef TCGETS2
        } else if (opt & TERMIOS_OLD) {
-               memcpy(&tmp_termios, tty->termios, sizeof(struct termios));
                if (user_termios_to_kernel_termios_1(&tmp_termios,
-                                               (struct termios_v1 __user *)arg))
+                                               (struct termios __user *)arg))
                        return -EFAULT;
-#endif
        } else {
                if (user_termios_to_kernel_termios(&tmp_termios,
-                                               (struct termios __user *)arg))
+                                               (struct termios2 __user *)arg))
                        return -EFAULT;
        }
+#else
+       } else if (user_termios_to_kernel_termios(&tmp_termios,
+                                       (struct termios __user *)arg))
+               return -EFAULT;
+#endif
 
        /* If old style Bfoo values are used then load c_ispeed/c_ospeed with the real speed
           so its unconditionally usable */
@@ -495,8 +499,8 @@ static int get_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb)
        struct sgttyb tmp;
 
        mutex_lock(&tty->termios_mutex);
-       tmp.sg_ispeed = tty->c_ispeed;
-       tmp.sg_ospeed = tty->c_ospeed;
+       tmp.sg_ispeed = tty->termios->c_ispeed;
+       tmp.sg_ospeed = tty->termios->c_ospeed;
        tmp.sg_erase = tty->termios->c_cc[VERASE];
        tmp.sg_kill = tty->termios->c_cc[VKILL];
        tmp.sg_flags = get_sgflags(tty);
@@ -707,11 +711,11 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file,
                        return 0;
 #else
                case TCGETS:
-                       if (kernel_termios_to_user_termios_1((struct termios_v1 __user *)arg, real_tty->termios))
+                       if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios))
                                return -EFAULT;
                        return 0;
                case TCGETS2:
-                       if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios))
+                       if (kernel_termios_to_user_termios((struct termios2 __user *)arg, real_tty->termios))
                                return -EFAULT;
                        return 0;
                case TCSETSF2: