commit bbe184a616f66db7ef1fc714995bf999080f20ef
author Pat Erley <perley@cyngn.com> Mon Jan 25 11:25:36 2016 -0800
committer Josue Rivera <prbassplayer@gmail.com> Wed Apr 13 04:11:10 2016 +0200
tree 38673c923495802566c58c0aad2c96daae65b364
parent 632c61920e9e1e7266e4d7895ee33f64a712d339

libnfc-nci: Fix Ubikey on pn5xx devices

It seems like this was not a wrong state and handling it as one
breaks communication with Yubikeys on at least pn544 on M.

OPO-350
Partial revert of 7843ae53c4aa12431e4a865f281cfdccc2822cf6

Change-Id: If43b524b9f1bdcf67a53bd4f7f6c4a61281881e0

src/nfa/dm/nfa_dm_discover.c

diff --git a/src/nfa/dm/nfa_dm_discover.c b/src/nfa/dm/nfa_dm_discover.c
index 6066381..5ce4524 100644
--- a/src/nfa/dm/nfa_dm_discover.c
+++ b/src/nfa/dm/nfa_dm_discover.c
@@ -1995,17 +1995,7 @@
         }
         break;
     case NFA_DM_RF_DISCOVER_NTF:
-        /* Notification Type = NCI_DISCOVER_NTF_LAST_ABORT */
-        if (p_data->nfc_discover.result.more == NCI_DISCOVER_NTF_LAST_ABORT)
-        {
-            /* Fix for multiple tags: After receiving deactivate event, restart discovery */
-            NFA_TRACE_DEBUG0 ("Received NCI_DISCOVER_NTF_LAST_ABORT, sending deactivate command");
-            NFC_Deactivate (NFA_DEACTIVATE_TYPE_IDLE);
-        }
-        else
-        {
-            nfa_dm_disc_new_state (NFA_DM_RFST_W4_ALL_DISCOVERIES);
-        }
+        nfa_dm_disc_new_state (NFA_DM_RFST_W4_ALL_DISCOVERIES);
         nfa_dm_notify_discovery (p_data);
         break;
     case NFA_DM_RF_INTF_ACTIVATED_NTF: