diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-07 22:01:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-07 22:01:52 +0200 |
| commit | 126285651b7f95282a0afe3a1b0221419b31d989 (patch) | |
| tree | e5d547255814a5ed55b6b74be3155464598b39f2 /net/bluetooth/hci_sock.c | |
| parent | sch_htb: fix doc warning in htb_lookup_leaf() (diff) | |
| parent | cxgb4: avoid link re-train during TC-MQPRIO configuration (diff) | |
| download | linux-126285651b7f95282a0afe3a1b0221419b31d989.tar.xz linux-126285651b7f95282a0afe3a1b0221419b31d989.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Bug fixes overlapping feature additions and refactoring, mostly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 6ef98a887571..e8d53af7c6a6 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -762,7 +762,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event) /* Detach sockets from device */ read_lock(&hci_sk_list.lock); sk_for_each(sk, &hci_sk_list.head) { - bh_lock_sock_nested(sk); + lock_sock(sk); if (hci_pi(sk)->hdev == hdev) { hci_pi(sk)->hdev = NULL; sk->sk_err = EPIPE; @@ -771,7 +771,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event) hci_dev_put(hdev); } - bh_unlock_sock(sk); + release_sock(sk); } read_unlock(&hci_sk_list.lock); } |