Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Bluetooth: Avoid Spurious AMP node access if not created"

This commit is contained in:
Linux Build Service Account 2015-01-28 23:00:39 -08:00 committed by Gerrit - the friendly Code Review server
parent e286ca9fea f5c3608c67
commit 01d577ec20
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/bluetooth/hci_event.c
View File

@ -3432,6 +3432,7 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev,
{
struct hci_ev_phy_link_complete *ev = (void *) skb->data;
struct hci_conn *hcon, *bredr_hcon;
struct amp_mgr *mgr;
BT_DBG("%s handle 0x%2.2x status 0x%2.2x", hdev->name, ev->phy_handle,
ev->status);
@ -3450,6 +3451,14 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev,
return;
}
BT_DBG("hcon %p mgr %p", hcon, hcon->amp_mgr);
mgr = hcon->amp_mgr;
if (!(mgr && mgr->l2cap_conn && mgr->l2cap_conn->hcon)) {
hci_dev_unlock(hdev);
BT_DBG("Amp Manager is not Initialized");
return;
}
bredr_hcon = hcon->amp_mgr->l2cap_conn->hcon;
hcon->state = BT_CONNECTED;