diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
| commit | 8d3c3ddfa85837e24fad6fa39318617cbb59e843 (patch) | |
| tree | f699dcaac2a11f0c9506ad111ae39fd5e3617c2d /net/bluetooth/rfcomm/tty.c | |
| parent | e8b2c3c47a53348aebbbeb5322e32937df958793 (diff) | |
| parent | 6927faf30920b8c03dfa007e732642a1f1f20089 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'net/bluetooth/rfcomm/tty.c')
| -rw-r--r-- | net/bluetooth/rfcomm/tty.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 2575c2db6404..d7b9af4703d0 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
| @@ -727,7 +727,9 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp) | |||
| 727 | break; | 727 | break; |
| 728 | } | 728 | } |
| 729 | 729 | ||
| 730 | tty_unlock(); | ||
| 730 | schedule(); | 731 | schedule(); |
| 732 | tty_lock(); | ||
| 731 | } | 733 | } |
| 732 | set_current_state(TASK_RUNNING); | 734 | set_current_state(TASK_RUNNING); |
| 733 | remove_wait_queue(&dev->wait, &wait); | 735 | remove_wait_queue(&dev->wait, &wait); |