Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a779b887 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

NFC: st21nfca: Improve load_session 



In case anybody uses previous patchset with the CLF, add a check to make sure
missing pipe are created.
st21nfca returns its pipe list in the creation order (most recent latest).

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f517a5f3

drivers/nfc/st21nfca/st21nfca.c

+19 −2
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ 
static DECLARE_BITMAP(dev_mask, ST21NFCA_NUM_DEVICES);



static struct nfc_hci_gate st21nfca_gates[] = {

	{NFC_HCI_ADMIN_GATE, NFC_HCI_INVALID_PIPE},

	{NFC_HCI_ADMIN_GATE, NFC_HCI_ADMIN_PIPE},

	{NFC_HCI_LOOPBACK_GATE, NFC_HCI_INVALID_PIPE},

	{NFC_HCI_ID_MGMT_GATE, NFC_HCI_INVALID_PIPE},

	{NFC_HCI_LINK_MGMT_GATE, NFC_HCI_INVALID_PIPE},

	{NFC_HCI_LINK_MGMT_GATE, NFC_HCI_LINK_MGMT_PIPE},

	{NFC_HCI_RF_READER_B_GATE, NFC_HCI_INVALID_PIPE},

	{NFC_HCI_RF_READER_A_GATE, NFC_HCI_INVALID_PIPE},

	{ST21NFCA_DEVICE_MGNT_GATE, ST21NFCA_DEVICE_MGNT_PIPE},
@@ -170,6 +170,23 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev) 
				st21nfca_gates[j].pipe;

		}

	}



	/*

	 * 3 gates have a well known pipe ID.

	 * They will never appear in the pipe list

	 */

	if (skb_pipe_list->len + 3 < ARRAY_SIZE(st21nfca_gates)) {

		for (i = skb_pipe_list->len + 3;

				i < ARRAY_SIZE(st21nfca_gates); 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_info;

		}

	}



	memcpy(hdev->init_data.gates, st21nfca_gates, sizeof(st21nfca_gates));

free_info:

	kfree_skb(skb_pipe_info);