diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-27 18:28:46 +0100 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2012-01-03 01:19:52 +0100 |
| commit | ee65d19e25c7ace7792bcd289776b2e24f4bf059 (patch) | |
| tree | 5983c4d9ead9af1b0fe2010b3f4259794ee8bd6b /net/bluetooth | |
| parent | Bluetooth: Fix context in RFCOMM tty (diff) | |
| download | linux-ee65d19e25c7ace7792bcd289776b2e24f4bf059.tar.xz linux-ee65d19e25c7ace7792bcd289776b2e24f4bf059.zip | |
Bluetooth: Remove *_bh locks from SCO
Those locks are not shared between interrupt and process context anymore,
so remove the part that disable interrupts. We are still safe because
preemption is disabled.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/sco.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 0d59e61d7822..471283e20254 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -482,7 +482,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le goto done; } - write_lock_bh(&sco_sk_list.lock); + write_lock(&sco_sk_list.lock); if (bacmp(src, BDADDR_ANY) && __sco_get_sock_by_addr(src)) { err = -EADDRINUSE; @@ -492,7 +492,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le sk->sk_state = BT_BOUND; } - write_unlock_bh(&sco_sk_list.lock); + write_unlock(&sco_sk_list.lock); done: release_sock(sk); @@ -965,14 +965,14 @@ static int sco_debugfs_show(struct seq_file *f, void *p) struct sock *sk; struct hlist_node *node; - read_lock_bh(&sco_sk_list.lock); + read_lock(&sco_sk_list.lock); sk_for_each(sk, node, &sco_sk_list.head) { seq_printf(f, "%s %s %d\n", batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), sk->sk_state); } - read_unlock_bh(&sco_sk_list.lock); + read_unlock(&sco_sk_list.lock); return 0; } |