From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Sun, 25 Oct 2015 21:54:28 +0000 (+0100)
Subject: NFC: st-nci: Open NCI_HCI_LINK_MGMT_PIPE
X-Git-Tag: MMI-PSA29.97-13-9~9125^2~42^2~32
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9dfe29f1796f9d92db6e7d33a3fc8ed8e496912a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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;
 }