diff options
| author | Gustavo F. Padovan | 2011-06-17 18:03:21 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-12-18 20:07:54 +0100 |
| commit | 09fd0de5bd8f8ef3317e5365f92f1a13dcd89aa9 (patch) | |
| tree | e29f1e4fc4555eefb5a39dfd1e230afcf28da999 /net/bluetooth/hci_sock.c | |
| parent | Bluetooth: Process recv path in a workqueue instead of a tasklet (diff) | |
| download | kernel-qcow2-linux-09fd0de5bd8f8ef3317e5365f92f1a13dcd89aa9.tar.gz kernel-qcow2-linux-09fd0de5bd8f8ef3317e5365f92f1a13dcd89aa9.tar.xz kernel-qcow2-linux-09fd0de5bd8f8ef3317e5365f92f1a13dcd89aa9.zip | |
Bluetooth: Replace spin_lock by mutex in hci_dev
Now we run everything in HCI in process context, so it's a better idea use
mutex instead spin_lock. The macro remains hci_dev_lock() (and I got rid
of hci_dev_lock_bh()), of course.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index f6afe3d76a66..399be345ea22 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -188,11 +188,11 @@ static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg) if (copy_from_user(&bdaddr, arg, sizeof(bdaddr))) return -EFAULT; - hci_dev_lock_bh(hdev); + hci_dev_lock(hdev); err = hci_blacklist_add(hdev, &bdaddr); - hci_dev_unlock_bh(hdev); + hci_dev_unlock(hdev); return err; } @@ -205,11 +205,11 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg) if (copy_from_user(&bdaddr, arg, sizeof(bdaddr))) return -EFAULT; - hci_dev_lock_bh(hdev); + hci_dev_lock(hdev); err = hci_blacklist_del(hdev, &bdaddr); - hci_dev_unlock_bh(hdev); + hci_dev_unlock(hdev); return err; } |