diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-15 07:25:17 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-15 07:25:17 +0000 |
| commit | 904753301033498215cdb2d6bd38f6ffaf42b347 (patch) | |
| tree | 25becea3ba9bcd302cdb21be34eeb46aa9643b29 | |
| parent | 2fe9bc4d5b6036985919489bc92a2743a46d0393 (diff) | |
| parent | 775c2b8116ddd38e944ae9e3d359a1a562938512 (diff) | |
| download | android_hardware_nxp_nfc-904753301033498215cdb2d6bd38f6ffaf42b347.tar.gz android_hardware_nxp_nfc-904753301033498215cdb2d6bd38f6ffaf42b347.tar.bz2 android_hardware_nxp_nfc-904753301033498215cdb2d6bd38f6ffaf42b347.zip | |
Snap for 4656203 from 775c2b8116ddd38e944ae9e3d359a1a562938512 to pi-release
Change-Id: Ib21bc9029f54703cbaed361833cf4e50001cc5f4
| -rwxr-xr-x | halimpl/hal/phNxpNciHal.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/halimpl/hal/phNxpNciHal.cc b/halimpl/hal/phNxpNciHal.cc index 57463b9..24c994f 100755 --- a/halimpl/hal/phNxpNciHal.cc +++ b/halimpl/hal/phNxpNciHal.cc @@ -769,8 +769,10 @@ int phNxpNciHal_open(nfc_stack_callback_t* p_cback, clean_and_return: CONCURRENCY_UNLOCK(); /* Report error status */ - (*nxpncihal_ctrl.p_nfc_stack_cback)(HAL_NFC_OPEN_CPLT_EVT, - HAL_NFC_STATUS_FAILED); + if (p_cback != NULL) { + (*p_cback)(HAL_NFC_OPEN_CPLT_EVT, + HAL_NFC_STATUS_FAILED); + } nxpncihal_ctrl.p_nfc_stack_cback = NULL; nxpncihal_ctrl.p_nfc_stack_data_cback = NULL; |