diff options
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 64f864651d86..050372979076 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -686,14 +686,13 @@ do { \ | |||
| 686 | prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \ | 686 | prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \ |
| 687 | if (condition) \ | 687 | if (condition) \ |
| 688 | break; \ | 688 | break; \ |
| 689 | if (!signal_pending(current)) { \ | 689 | if (signal_pending(current)) { \ |
| 690 | tty_unlock(tty); \ | 690 | ret = -ERESTARTSYS; \ |
| 691 | schedule(); \ | 691 | break; \ |
| 692 | tty_lock(tty); \ | ||
| 693 | continue; \ | ||
| 694 | } \ | 692 | } \ |
| 695 | ret = -ERESTARTSYS; \ | 693 | tty_unlock(tty); \ |
| 696 | break; \ | 694 | schedule(); \ |
| 695 | tty_lock(tty); \ | ||
| 697 | } \ | 696 | } \ |
| 698 | finish_wait(&wq, &__wait); \ | 697 | finish_wait(&wq, &__wait); \ |
| 699 | } while (0) | 698 | } while (0) |