summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-02-18 16:43:51 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-18 16:43:51 -0500
commit1b68e676204927f69e987b86a99e19e61cc37dcc (patch)
tree6649cd203406aa3286d85d505106e058d5d5c338 /net
parent0f5cd45960173ba5b36727decbb4a241cbd35ef9 (diff)
parente9036e336a8e5640871e0006ea4a89982b25046f (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/rfcomm/tty.c2
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);