From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Sat, 30 Apr 2016 07:12:43 +0000 (+0200)
Subject: nfc: st21nfca: A APDU_READER_GATE pipe is unexpected on a UICC
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7cb6ab590d7d203b53284f4f211d4a8a89a125fc;p=deliverable%2Flinux.git

nfc: st21nfca: A APDU_READER_GATE pipe is unexpected on a UICC

An APDU_READER_GATE pipe is not expected on a UICC. Be more
explicit so that an other secure element form factor (SD card)
does not prompt this message.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/nfc/st21nfca/core.c b/drivers/nfc/st21nfca/core.c
index 25ab279606c2..dacb9166081b 100644
--- a/drivers/nfc/st21nfca/core.c
+++ b/drivers/nfc/st21nfca/core.c
@@ -176,7 +176,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
 		 */
 		info = (struct st21nfca_pipe_info *) skb_pipe_info->data;
 		if (info->dst_gate_id == ST21NFCA_APDU_READER_GATE &&
-			info->src_host_id != ST21NFCA_ESE_HOST_ID) {
+			info->src_host_id == NFC_HCI_UICC_HOST_ID) {
 			pr_err("Unexpected apdu_reader pipe on host %x\n",
 				info->src_host_id);
 			kfree_skb(skb_pipe_info);