--- zzzz-none-000/linux-2.6.19.2/net/bluetooth/hci_event.c 2007-01-10 19:10:37.000000000 +0000 +++ davinci-8020-5505/linux-2.6.19.2/net/bluetooth/hci_event.c 2007-01-11 07:38:19.000000000 +0000 @@ -57,7 +57,6 @@ static void hci_cc_link_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb) { __u8 status; - struct hci_conn *pend; BT_DBG("%s ocf 0x%x", hdev->name, ocf); @@ -72,15 +71,6 @@ clear_bit(HCI_INQUIRY, &hdev->flags); hci_req_complete(hdev, status); } - - hci_dev_lock(hdev); - - pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2); - if (pend) - hci_acl_connect(pend); - - hci_dev_unlock(hdev); - break; default: @@ -575,20 +565,11 @@ static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) { __u8 status = *((__u8 *) skb->data); - struct hci_conn *pend; BT_DBG("%s status %d", hdev->name, status); clear_bit(HCI_INQUIRY, &hdev->flags); hci_req_complete(hdev, status); - - hci_dev_lock(hdev); - - pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2); - if (pend) - hci_acl_connect(pend); - - hci_dev_unlock(hdev); } /* Inquiry Result */