---

yaml --- r: 354844 b: refs/heads/master c: 183d95c h: refs/heads/master v: v3
git-mirror · Feb 4, 2013 · 7841a02 · 7841a02
1 parent 53e2d37
commit 7841a02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d9b109060f690f5c835130ff54165ae157b3087
+refs/heads/master: 183d95cdd834381c594d3aa801c1f9f9c0c54fa9
diff --git a/trunk/drivers/tty/tty_ioctl.c b/trunk/drivers/tty/tty_ioctl.c
@@ -617,7 +617,7 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
 	if (opt & TERMIOS_WAIT) {
 		tty_wait_until_sent(tty, 0);
 		if (signal_pending(current))
-			return -EINTR;
+			return -ERESTARTSYS;
 	}
 
 	tty_set_termios(tty, &tmp_termios);
@@ -684,7 +684,7 @@ static int set_termiox(struct tty_struct *tty, void __user *arg, int opt)
 	if (opt & TERMIOS_WAIT) {
 		tty_wait_until_sent(tty, 0);
 		if (signal_pending(current))
-			return -EINTR;
+			return -ERESTARTSYS;
 	}
 
 	mutex_lock(&tty->termios_mutex);