diff options
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 4ddef57d03a7..ce3f6658f4b2 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
| @@ -467,7 +467,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f | |||
| 467 | long timeo; | 467 | long timeo; |
| 468 | int err = 0; | 468 | int err = 0; |
| 469 | 469 | ||
| 470 | lock_sock(sk); | 470 | lock_sock_nested(sk, SINGLE_DEPTH_NESTING); |
| 471 | 471 | ||
| 472 | if (sk->sk_type != SOCK_STREAM) { | 472 | if (sk->sk_type != SOCK_STREAM) { |
| 473 | err = -EINVAL; | 473 | err = -EINVAL; |
| @@ -504,7 +504,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f | |||
| 504 | 504 | ||
| 505 | release_sock(sk); | 505 | release_sock(sk); |
| 506 | timeo = schedule_timeout(timeo); | 506 | timeo = schedule_timeout(timeo); |
| 507 | lock_sock(sk); | 507 | lock_sock_nested(sk, SINGLE_DEPTH_NESTING); |
| 508 | } | 508 | } |
| 509 | __set_current_state(TASK_RUNNING); | 509 | __set_current_state(TASK_RUNNING); |
| 510 | remove_wait_queue(sk_sleep(sk), &wait); | 510 | remove_wait_queue(sk_sleep(sk), &wait); |
