]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nfc: st-nci: A APDU_READER_GATE pipe is unexpected on a UICC
authorChristophe Ricard <christophe.ricard@gmail.com>
Sat, 30 Apr 2016 07:12:42 +0000 (09:12 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 3 May 2016 23:33:08 +0000 (01:33 +0200)
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>
drivers/nfc/st-nci/se.c

index 79efccd1317278262e41d6fc6272e536bc9f6319..edb6ee12a372a0c7223f6c52b2215d2ca714a0dd 100644 (file)
@@ -222,7 +222,7 @@ int st_nci_hci_load_session(struct nci_dev *ndev)
                 */
                dm_pipe_info = (struct st_nci_pipe_info *)skb_pipe_info->data;
                if (dm_pipe_info->dst_gate_id == ST_NCI_APDU_READER_GATE &&
-                   dm_pipe_info->src_host_id != ST_NCI_ESE_HOST_ID) {
+                   dm_pipe_info->src_host_id == ST_NCI_UICC_HOST_ID) {
                        pr_err("Unexpected apdu_reader pipe on host %x\n",
                               dm_pipe_info->src_host_id);
                        kfree_skb(skb_pipe_info);