diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-19 14:28:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-19 14:28:22 -0500 |
| commit | 9662cbc712babe3f7a792af2bdd47fa0c631f27f (patch) | |
| tree | 9a19f5656fb83ab58a4a3773b12ed1036bf8753b /net/bluetooth/hidp/core.c | |
| parent | 640f5950a7d9fd0d279d843b261eb934793605fb (diff) | |
| parent | 4b0b2f088f12e2ada1297502d7bebde182cf65b0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'net/bluetooth/hidp/core.c')
| -rw-r--r-- | net/bluetooth/hidp/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 3c2d888925d..d478be11d56 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -795,11 +795,11 @@ static struct hci_conn *hidp_get_connection(struct hidp_session *session) if (!hdev) return NULL; - hci_dev_lock_bh(hdev); + hci_dev_lock(hdev); conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst); if (conn) hci_conn_hold_device(conn); - hci_dev_unlock_bh(hdev); + hci_dev_unlock(hdev); hci_dev_put(hdev); |