diff --git a/[refs] b/[refs] index d64cb4f83ad7..98ed29d2e516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dd070d21e2cb34b4162d564d73cca3591f94389 +refs/heads/master: ded2f295a36d17838fe97e80d7b6ea83381474f8 diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c index be6a373601b7..79ff3a5e925d 100644 --- a/trunk/drivers/tty/pty.c +++ b/trunk/drivers/tty/pty.c @@ -441,6 +441,8 @@ static int pty_bsd_ioctl(struct tty_struct *tty, return pty_get_pktmode(tty, (int __user *)arg); case TIOCSIG: /* Send signal to other side of pty */ return pty_signal(tty, (int) arg); + case TIOCGPTN: /* TTY returns ENOTTY, but glibc expects EINVAL here */ + return -EINVAL; } return -ENOIOCTLCMD; }