diff options
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index aea2bdd1510f..f066678faeee 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -370,7 +370,7 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr | |||
370 | goto done; | 370 | goto done; |
371 | } | 371 | } |
372 | 372 | ||
373 | write_lock_bh(&rfcomm_sk_list.lock); | 373 | write_lock(&rfcomm_sk_list.lock); |
374 | 374 | ||
375 | if (sa->rc_channel && __rfcomm_get_sock_by_addr(sa->rc_channel, &sa->rc_bdaddr)) { | 375 | if (sa->rc_channel && __rfcomm_get_sock_by_addr(sa->rc_channel, &sa->rc_bdaddr)) { |
376 | err = -EADDRINUSE; | 376 | err = -EADDRINUSE; |
@@ -381,7 +381,7 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr | |||
381 | sk->sk_state = BT_BOUND; | 381 | sk->sk_state = BT_BOUND; |
382 | } | 382 | } |
383 | 383 | ||
384 | write_unlock_bh(&rfcomm_sk_list.lock); | 384 | write_unlock(&rfcomm_sk_list.lock); |
385 | 385 | ||
386 | done: | 386 | done: |
387 | release_sock(sk); | 387 | release_sock(sk); |
@@ -455,7 +455,7 @@ static int rfcomm_sock_listen(struct socket *sock, int backlog) | |||
455 | 455 | ||
456 | err = -EINVAL; | 456 | err = -EINVAL; |
457 | 457 | ||
458 | write_lock_bh(&rfcomm_sk_list.lock); | 458 | write_lock(&rfcomm_sk_list.lock); |
459 | 459 | ||
460 | for (channel = 1; channel < 31; channel++) | 460 | for (channel = 1; channel < 31; channel++) |
461 | if (!__rfcomm_get_sock_by_addr(channel, src)) { | 461 | if (!__rfcomm_get_sock_by_addr(channel, src)) { |
@@ -464,7 +464,7 @@ static int rfcomm_sock_listen(struct socket *sock, int backlog) | |||
464 | break; | 464 | break; |
465 | } | 465 | } |
466 | 466 | ||
467 | write_unlock_bh(&rfcomm_sk_list.lock); | 467 | write_unlock(&rfcomm_sk_list.lock); |
468 | 468 | ||
469 | if (err < 0) | 469 | if (err < 0) |
470 | goto done; | 470 | goto done; |
@@ -982,7 +982,7 @@ static int rfcomm_sock_debugfs_show(struct seq_file *f, void *p) | |||
982 | struct sock *sk; | 982 | struct sock *sk; |
983 | struct hlist_node *node; | 983 | struct hlist_node *node; |
984 | 984 | ||
985 | read_lock_bh(&rfcomm_sk_list.lock); | 985 | read_lock(&rfcomm_sk_list.lock); |
986 | 986 | ||
987 | sk_for_each(sk, node, &rfcomm_sk_list.head) { | 987 | sk_for_each(sk, node, &rfcomm_sk_list.head) { |
988 | seq_printf(f, "%s %s %d %d\n", | 988 | seq_printf(f, "%s %s %d %d\n", |
@@ -991,7 +991,7 @@ static int rfcomm_sock_debugfs_show(struct seq_file *f, void *p) | |||
991 | sk->sk_state, rfcomm_pi(sk)->channel); | 991 | sk->sk_state, rfcomm_pi(sk)->channel); |
992 | } | 992 | } |
993 | 993 | ||
994 | read_unlock_bh(&rfcomm_sk_list.lock); | 994 | read_unlock(&rfcomm_sk_list.lock); |
995 | 995 | ||
996 | return 0; | 996 | return 0; |
997 | } | 997 | } |