From: Christophe Ricard Date: Sat, 30 Apr 2016 07:12:42 +0000 (+0200) Subject: nfc: st-nci: A APDU_READER_GATE pipe is unexpected on a UICC X-Git-Tag: v4.7-rc1~154^2~64^2~16 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0209e79d540440962913054fae499ad1892a4f15;p=linux.git nfc: st-nci: 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 Signed-off-by: Samuel Ortiz --- diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index 79efccd13172..edb6ee12a372 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c @@ -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);