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/hci_sock.c | |
| parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (diff) | |
| parent | c5993de864d96b3656e9fca38c377b130105d97a (diff) | |
| download | linux-874c60bad92564358e87d58f505fceb0b09ec1aa.tar.gz linux-874c60bad92564358e87d58f505fceb0b09ec1aa.tar.bz2 linux-874c60bad92564358e87d58f505fceb0b09ec1aa.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 6d94616af312..0dcc96266779 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -767,7 +767,6 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event, /* Detach sockets from device */ read_lock(&hci_sk_list.lock); sk_for_each(sk, node, &hci_sk_list.head) { - local_bh_disable(); bh_lock_sock_nested(sk); if (hci_pi(sk)->hdev == hdev) { hci_pi(sk)->hdev = NULL; @@ -778,7 +777,6 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event, hci_dev_put(hdev); } bh_unlock_sock(sk); - local_bh_enable(); } read_unlock(&hci_sk_list.lock); } |