summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/st-nci
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-10-25 22:54:28 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-26 06:53:14 +0100
commit9dfe29f1796f9d92db6e7d33a3fc8ed8e496912a (patch)
tree1f06a20d1ac0a2b4fc33c50899d134c00fc8065c /drivers/nfc/st-nci
parentNFC: st21nfca: Remove HCI gates initialization in load_session (diff)
downloadlinux-9dfe29f1796f9d92db6e7d33a3fc8ed8e496912a.tar.xz
linux-9dfe29f1796f9d92db6e7d33a3fc8ed8e496912a.zip
NFC: st-nci: Open NCI_HCI_LINK_MGMT_PIPE
NCI_HCI_LINK_MGMT_PIPE was never opened in st_nci_hci_load_session. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/st-nci')
-rw-r--r--drivers/nfc/st-nci/se.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index 3ffac0e67f94..35221654951b 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -244,6 +244,14 @@ int st_nci_hci_load_session(struct nci_dev *ndev)
kfree_skb(skb_pipe_info);
}
+ /*
+ * 3 gates have a well known pipe ID. Only NCI_HCI_LINK_MGMT_GATE
+ * is not yet open at this stage.
+ */
+ r = nci_hci_connect_gate(ndev, ST_NCI_HOST_CONTROLLER_ID,
+ NCI_HCI_LINK_MGMT_GATE,
+ NCI_HCI_LINK_MGMT_PIPE);
+
kfree_skb(skb_pipe_list);
return r;
}