From ad41423be610f9458203d499bf574f3da95df7d9 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Tue, 27 Dec 2011 15:28:46 -0200 Subject: [PATCH] --- yaml --- r: 284311 b: refs/heads/master c: ee65d19e25c7ace7792bcd289776b2e24f4bf059 h: refs/heads/master i: 284309: 1128905c9854fd6584a15dca4ff2526cd1eaba5b 284307: ac3e70a37aa87d4168071152e356687da6c6d54f 284303: 1805262173384e4006dbc03b7581ce902f42add0 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/sco.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3cf462ffaaa3..c440820ef940 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 393432cd8dc02b88a00decd495913643aa5ff705 +refs/heads/master: ee65d19e25c7ace7792bcd289776b2e24f4bf059 diff --git a/trunk/net/bluetooth/sco.c b/trunk/net/bluetooth/sco.c index 0d59e61d7822..471283e20254 100644 --- a/trunk/net/bluetooth/sco.c +++ b/trunk/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; }