commit 2b2e77bbdbd96b8931acd1284d7e9c62bb024493
author Linux Build Service Account <lnxbuild@quicinc.com> Thu Jan 04 11:52:48 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 04 11:52:48 2018 -0800
tree aa2d35803980990ed208c47403fa2e5eab3225ec
parent 99439927928bdfd3c9aea03aea03f151febfd2ee
parent f9ac485003b96fa03420ce5d398dcb6e6c3b983f

Merge "NFC: Integrate constants, hal modifications and feature list"

src/nfa/hci/nfa_hci_main.c

diff --git a/src/nfa/hci/nfa_hci_main.c b/src/nfa/hci/nfa_hci_main.c
index 35debff..08def65 100644
--- a/src/nfa/hci/nfa_hci_main.c
+++ b/src/nfa/hci/nfa_hci_main.c
@@ -965,7 +965,7 @@
 void nfa_hci_conn_cback(uint8_t conn_id, tNFC_CONN_EVT event,
                         tNFC_CONN* p_data) {
   uint8_t* p;
-  NFC_HDR* p_pkt = (NFC_HDR*)p_data->data.p_data;
+  NFC_HDR* p_pkt = NULL;
   uint8_t chaining_bit;
   uint8_t pipe;
   uint16_t pkt_len;
@@ -1048,6 +1048,9 @@
 #endif
   }
 
+  if(event == NFC_DATA_CEVT)
+      p_pkt = (NFC_HDR*)p_data->data.p_data;
+
   if ((event != NFC_DATA_CEVT) || (p_pkt == NULL)) return;
 
   if ((nfa_hci_cb.hci_state == NFA_HCI_STATE_WAIT_NETWK_ENABLE) ||