diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/char/tty_io.c | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/char/tty_io.c')
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index eda27899372c..047a17339f83 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -3349,7 +3349,7 @@ static int send_break(struct tty_struct *tty, unsigned int duration) | |||
| 3349 | msleep_interruptible(duration); | 3349 | msleep_interruptible(duration); |
| 3350 | tty->ops->break_ctl(tty, 0); | 3350 | tty->ops->break_ctl(tty, 0); |
| 3351 | tty_write_unlock(tty); | 3351 | tty_write_unlock(tty); |
| 3352 | if (!signal_pending(current)) | 3352 | if (signal_pending(current)) |
| 3353 | return -EINTR; | 3353 | return -EINTR; |
| 3354 | return 0; | 3354 | return 0; |
| 3355 | } | 3355 | } |