aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-21 21:16:11 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2014-02-23 17:34:09 -0500
commit4f913d4631fa9c47320669b2e7ec62fa7436719d (patch)
treec1cca891534f1c752464fbbe3334e14ccde1209c /net
parent156cef80f2a1aea4f150dff5d990e8fbbd96d862 (diff)
NFC: digital: Use matching_[im|tm]_protocols to check with NFC protocols masks
This ensures we won't add polling function to the table of polling technologies for non-supported protocols. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/digital_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c
index 969a7f924a37..492fa7355e0d 100644
--- a/net/nfc/digital_core.c
+++ b/net/nfc/digital_core.c
@@ -475,7 +475,7 @@ static int digital_start_poll(struct nfc_dev *nfc_dev, __u32 im_protocols,
475 digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_106A, 475 digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_106A,
476 digital_in_send_sens_req); 476 digital_in_send_sens_req);
477 477
478 if (im_protocols & DIGITAL_PROTO_NFCF_RF_TECH) { 478 if (matching_im_protocols & DIGITAL_PROTO_NFCF_RF_TECH) {
479 digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_212F, 479 digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_212F,
480 digital_in_send_sensf_req); 480 digital_in_send_sensf_req);
481 481
@@ -487,7 +487,7 @@ static int digital_start_poll(struct nfc_dev *nfc_dev, __u32 im_protocols,
487 digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_ISO15693, 487 digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_ISO15693,
488 digital_in_send_iso15693_inv_req); 488 digital_in_send_iso15693_inv_req);
489 489
490 if (tm_protocols & NFC_PROTO_NFC_DEP_MASK) { 490 if (matching_tm_protocols & NFC_PROTO_NFC_DEP_MASK) {
491 if (ddev->ops->tg_listen_mdaa) { 491 if (ddev->ops->tg_listen_mdaa) {
492 digital_add_poll_tech(ddev, 0, 492 digital_add_poll_tech(ddev, 0,
493 digital_tg_listen_mdaa); 493 digital_tg_listen_mdaa);