diff --git a/[refs] b/[refs] index 2b760b70b1b5..546fc5c5a240 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2a4a7ce3a995b83f59792ec9981d20ac550ccb0 +refs/heads/master: 3e2a078ca6a0d3122bbf2b904cd7ccf21a5ca21d diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index e94bee032314..750131010af0 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -3322,7 +3322,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; }