commit a407eaaefd53f13bf9fbeaf43ef8de00604e8183
author Martijn Coenen <maco@google.com> Wed Aug 19 11:39:29 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 19 11:39:29 2015 +0000
tree 3d643d9391e2907d31e0d67b538eeb522d9070a4
parent 54aa01cab3ef24dc33d871fc98a0845cfb2ab59d
parent 4896e0e97c2af11b31f50fab9d223f430f483940

Merge "Fix Mifare Classic presence check."

src/nfa/rw/nfa_rw_act.c

diff --git a/src/nfa/rw/nfa_rw_act.c b/src/nfa/rw/nfa_rw_act.c
index bcb10e5..dd1e624 100644
--- a/src/nfa/rw/nfa_rw_act.c
+++ b/src/nfa/rw/nfa_rw_act.c
@@ -1824,12 +1824,17 @@
     }
     else if (NFC_PROTOCOL_T2T == protocol)
     {
-        /* If T2T NFC-Forum, then let RW handle presence check; otherwise fall through */
+        /* If T2T NFC-Forum, then let RW handle presence check */
         if (sel_res == NFC_SEL_RES_NFC_FORUM_T2T)
         {
             /* Type 2 tag have not sent NACK after activation */
             status = RW_T2tPresenceCheck();
         }
+        else
+        {
+            /* Will fall back to deactivate/reactivate */
+            unsupported = TRUE;
+        }
     }
     else if (NFC_PROTOCOL_T3T == protocol)
     {