diff options
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r-- | net/bluetooth/hci_conn.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 3131a99dd5f6..d45783de5e2a 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -876,7 +876,7 @@ int hci_get_conn_list(void __user *arg) | |||
876 | 876 | ||
877 | ci = cl->conn_info; | 877 | ci = cl->conn_info; |
878 | 878 | ||
879 | hci_dev_lock_bh(hdev); | 879 | hci_dev_lock(hdev); |
880 | list_for_each_entry(c, &hdev->conn_hash.list, list) { | 880 | list_for_each_entry(c, &hdev->conn_hash.list, list) { |
881 | bacpy(&(ci + n)->bdaddr, &c->dst); | 881 | bacpy(&(ci + n)->bdaddr, &c->dst); |
882 | (ci + n)->handle = c->handle; | 882 | (ci + n)->handle = c->handle; |
@@ -887,7 +887,7 @@ int hci_get_conn_list(void __user *arg) | |||
887 | if (++n >= req.conn_num) | 887 | if (++n >= req.conn_num) |
888 | break; | 888 | break; |
889 | } | 889 | } |
890 | hci_dev_unlock_bh(hdev); | 890 | hci_dev_unlock(hdev); |
891 | 891 | ||
892 | cl->dev_id = hdev->id; | 892 | cl->dev_id = hdev->id; |
893 | cl->conn_num = n; | 893 | cl->conn_num = n; |
@@ -911,7 +911,7 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg) | |||
911 | if (copy_from_user(&req, arg, sizeof(req))) | 911 | if (copy_from_user(&req, arg, sizeof(req))) |
912 | return -EFAULT; | 912 | return -EFAULT; |
913 | 913 | ||
914 | hci_dev_lock_bh(hdev); | 914 | hci_dev_lock(hdev); |
915 | conn = hci_conn_hash_lookup_ba(hdev, req.type, &req.bdaddr); | 915 | conn = hci_conn_hash_lookup_ba(hdev, req.type, &req.bdaddr); |
916 | if (conn) { | 916 | if (conn) { |
917 | bacpy(&ci.bdaddr, &conn->dst); | 917 | bacpy(&ci.bdaddr, &conn->dst); |
@@ -921,7 +921,7 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg) | |||
921 | ci.state = conn->state; | 921 | ci.state = conn->state; |
922 | ci.link_mode = conn->link_mode; | 922 | ci.link_mode = conn->link_mode; |
923 | } | 923 | } |
924 | hci_dev_unlock_bh(hdev); | 924 | hci_dev_unlock(hdev); |
925 | 925 | ||
926 | if (!conn) | 926 | if (!conn) |
927 | return -ENOENT; | 927 | return -ENOENT; |
@@ -937,11 +937,11 @@ int hci_get_auth_info(struct hci_dev *hdev, void __user *arg) | |||
937 | if (copy_from_user(&req, arg, sizeof(req))) | 937 | if (copy_from_user(&req, arg, sizeof(req))) |
938 | return -EFAULT; | 938 | return -EFAULT; |
939 | 939 | ||
940 | hci_dev_lock_bh(hdev); | 940 | hci_dev_lock(hdev); |
941 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &req.bdaddr); | 941 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &req.bdaddr); |
942 | if (conn) | 942 | if (conn) |
943 | req.type = conn->auth_type; | 943 | req.type = conn->auth_type; |
944 | hci_dev_unlock_bh(hdev); | 944 | hci_dev_unlock(hdev); |
945 | 945 | ||
946 | if (!conn) | 946 | if (!conn) |
947 | return -ENOENT; | 947 | return -ENOENT; |