diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-01-10 15:44:17 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-01-10 15:44:17 -0500 |
commit | 874c60bad92564358e87d58f505fceb0b09ec1aa (patch) | |
tree | f6a5cadf50e07971f711b6cdf627797c5e1c095b /net/bluetooth/af_bluetooth.c | |
parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (diff) | |
parent | c5993de864d96b3656e9fca38c377b130105d97a (diff) | |
download | linux-874c60bad92564358e87d58f505fceb0b09ec1aa.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
-rw-r--r-- | net/bluetooth/af_bluetooth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index cdcfcabb34ab..ef92864ac625 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -156,17 +156,17 @@ static int bt_sock_create(struct net *net, struct socket *sock, int proto, void bt_sock_link(struct bt_sock_list *l, struct sock *sk) { - write_lock_bh(&l->lock); + write_lock(&l->lock); sk_add_node(sk, &l->head); - write_unlock_bh(&l->lock); + write_unlock(&l->lock); } EXPORT_SYMBOL(bt_sock_link); void bt_sock_unlink(struct bt_sock_list *l, struct sock *sk) { - write_lock_bh(&l->lock); + write_lock(&l->lock); sk_del_node_init(sk); - write_unlock_bh(&l->lock); + write_unlock(&l->lock); } EXPORT_SYMBOL(bt_sock_unlink); |