Merge commit 'v2.6.26' into bkl-removal

This commit is contained in:
Jonathan Corbet
2008-07-14 15:29:34 -06:00
1975 changed files with 41893 additions and 19758 deletions

View File

@@ -3349,7 +3349,7 @@ static int send_break(struct tty_struct *tty, unsigned int duration)
msleep_interruptible(duration);
tty->ops->break_ctl(tty, 0);
tty_write_unlock(tty);
if (!signal_pending(current))
if (signal_pending(current))
return -EINTR;
return 0;
}