diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/tty_ioctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index 8116bb1c8f80..b24f6c6a1ea3 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
@@ -947,7 +947,6 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file, | |||
947 | void __user *p = (void __user *)arg; | 947 | void __user *p = (void __user *)arg; |
948 | int ret = 0; | 948 | int ret = 0; |
949 | struct ktermios kterm; | 949 | struct ktermios kterm; |
950 | struct termiox ktermx; | ||
951 | 950 | ||
952 | if (tty->driver->type == TTY_DRIVER_TYPE_PTY && | 951 | if (tty->driver->type == TTY_DRIVER_TYPE_PTY && |
953 | tty->driver->subtype == PTY_TYPE_MASTER) | 952 | tty->driver->subtype == PTY_TYPE_MASTER) |
@@ -1049,7 +1048,8 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file, | |||
1049 | return ret; | 1048 | return ret; |
1050 | #endif | 1049 | #endif |
1051 | #ifdef TCGETX | 1050 | #ifdef TCGETX |
1052 | case TCGETX: | 1051 | case TCGETX: { |
1052 | struct termiox ktermx; | ||
1053 | if (real_tty->termiox == NULL) | 1053 | if (real_tty->termiox == NULL) |
1054 | return -EINVAL; | 1054 | return -EINVAL; |
1055 | mutex_lock(&real_tty->termios_mutex); | 1055 | mutex_lock(&real_tty->termios_mutex); |
@@ -1058,6 +1058,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file, | |||
1058 | if (copy_to_user(p, &ktermx, sizeof(struct termiox))) | 1058 | if (copy_to_user(p, &ktermx, sizeof(struct termiox))) |
1059 | ret = -EFAULT; | 1059 | ret = -EFAULT; |
1060 | return ret; | 1060 | return ret; |
1061 | } | ||
1061 | case TCSETX: | 1062 | case TCSETX: |
1062 | return set_termiox(real_tty, p, 0); | 1063 | return set_termiox(real_tty, p, 0); |
1063 | case TCSETXW: | 1064 | case TCSETXW: |