summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-22 10:16:11 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2014-02-23 23:34:09 +0100
commit4f913d4631fa9c47320669b2e7ec62fa7436719d (patch)
treec1cca891534f1c752464fbbe3334e14ccde1209c /net/nfc
parent156cef80f2a1aea4f150dff5d990e8fbbd96d862 (diff)
downloadop-kernel-dev-4f913d4631fa9c47320669b2e7ec62fa7436719d.zip
op-kernel-dev-4f913d4631fa9c47320669b2e7ec62fa7436719d.tar.gz
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/nfc')
-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 969a7f9..492fa73 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,
digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_106A,
digital_in_send_sens_req);
- if (im_protocols & DIGITAL_PROTO_NFCF_RF_TECH) {
+ if (matching_im_protocols & DIGITAL_PROTO_NFCF_RF_TECH) {
digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_212F,
digital_in_send_sensf_req);
@@ -487,7 +487,7 @@ static int digital_start_poll(struct nfc_dev *nfc_dev, __u32 im_protocols,
digital_add_poll_tech(ddev, NFC_DIGITAL_RF_TECH_ISO15693,
digital_in_send_iso15693_inv_req);
- if (tm_protocols & NFC_PROTO_NFC_DEP_MASK) {
+ if (matching_tm_protocols & NFC_PROTO_NFC_DEP_MASK) {
if (ddev->ops->tg_listen_mdaa) {
digital_add_poll_tech(ddev, 0,
digital_tg_listen_mdaa);
OpenPOWER on IntegriCloud