Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 09:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFC: st21nfca: Open NFC_HCI_LINK_MGMT_PIPE

Browse Source 
NFC_HCI_LINK_MGMT_PIPE was never opened in nfc_hci_load_session.

Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Christophe Ricard 2015-10-25 22:54:29 +01:00 committed by Samuel Ortiz
parent 9dfe29f179
commit 6443ce97d2
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/nfc/st21nfca/core.c
View File

@ -203,22 +203,13 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
}
/*
* 3 gates have a well known pipe ID.
* They will never appear in the pipe list
* 3 gates have a well known pipe ID. Only NFC_HCI_LINK_MGMT_GATE
* is not yet open at this stage.
*/
if (skb_pipe_list->len + 3 < ARRAY_SIZE(st21nfca_gates)) {
for (i = skb_pipe_list->len + 3;
i < ARRAY_SIZE(st21nfca_gates) - 2; i++) {
r = nfc_hci_connect_gate(hdev,
NFC_HCI_HOST_CONTROLLER_ID,
st21nfca_gates[i].gate,
st21nfca_gates[i].pipe);
if (r < 0)
goto free_list;
}
}
r = nfc_hci_connect_gate(hdev, NFC_HCI_HOST_CONTROLLER_ID,
NFC_HCI_LINK_MGMT_GATE,
NFC_HCI_LINK_MGMT_PIPE);
free_list:
kfree_skb(skb_pipe_list);
return r;
}