diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-18 23:03:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-18 23:03:41 +0100 |
| commit | b67afe7f43afd2f5cd98798993561920c1684c12 (patch) | |
| tree | e45a0e41c91a1d199fd865b011ed0d25f5497bb9 /net/bluetooth | |
| parent | mac80211: Clear PS related flag on disabling power save. (diff) | |
| parent | ath5k: Correct channel setting for AR2317 chip (diff) | |
| download | linux-b67afe7f43afd2f5cd98798993561920c1684c12.tar.xz linux-b67afe7f43afd2f5cd98798993561920c1684c12.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
Diffstat (limited to 'net/bluetooth')
| -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) break; } + tty_unlock(); schedule(); + tty_lock(); } set_current_state(TASK_RUNNING); remove_wait_queue(&dev->wait, &wait); |