Commit 6443ce97 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz

NFC: st21nfca: Open NFC_HCI_LINK_MGMT_PIPE

NFC_HCI_LINK_MGMT_PIPE was never opened in nfc_hci_load_session.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 9dfe29f1
...@@ -203,22 +203,13 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev) ...@@ -203,22 +203,13 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
} }
/* /*
* 3 gates have a well known pipe ID. * 3 gates have a well known pipe ID. Only NFC_HCI_LINK_MGMT_GATE
* They will never appear in the pipe list * is not yet open at this stage.
*/ */
if (skb_pipe_list->len + 3 < ARRAY_SIZE(st21nfca_gates)) { r = nfc_hci_connect_gate(hdev, NFC_HCI_HOST_CONTROLLER_ID,
for (i = skb_pipe_list->len + 3; NFC_HCI_LINK_MGMT_GATE,
i < ARRAY_SIZE(st21nfca_gates) - 2; i++) { NFC_HCI_LINK_MGMT_PIPE);
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;
}
}
free_list:
kfree_skb(skb_pipe_list); kfree_skb(skb_pipe_list);
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment