Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pul tty fixes from Greg Kroah-Hartman:
"Here are two tty core fixes that resolve some regressions that have
been reported recently. Both tiny fixes, but needed"
* tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: Fix transient pty write() EIO
tty/vt: Return EBUSY if deallocating VT1 and it is busy
+6
-12
+5
-8
drivers/tty/pty.c
+5
-8
drivers/tty/pty.c
···
244
244
245
245
static int pty_open(struct tty_struct *tty, struct file *filp)
246
246
{
247
-
int retval = -ENODEV;
248
-
249
247
if (!tty || !tty->link)
250
-
goto out;
248
+
return -ENODEV;
251
249
252
-
set_bit(TTY_IO_ERROR, &tty->flags);
253
-
254
-
retval = -EIO;
255
250
if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
256
251
goto out;
257
252
if (test_bit(TTY_PTY_LOCK, &tty->link->flags))
···
257
262
clear_bit(TTY_IO_ERROR, &tty->flags);
258
263
clear_bit(TTY_OTHER_CLOSED, &tty->link->flags);
259
264
set_bit(TTY_THROTTLED, &tty->flags);
260
-
retval = 0;
265
+
return 0;
266
+
261
267
out:
262
-
return retval;
268
+
set_bit(TTY_IO_ERROR, &tty->flags);
269
+
return -EIO;
263
270
}
264
271
265
272
static void pty_set_termios(struct tty_struct *tty,
+1
-4
drivers/tty/vt/vt_ioctl.c
+1
-4
drivers/tty/vt/vt_ioctl.c