diff options
| -rwxr-xr-x | src/phHal4Nfc.c | 10 | ||||
| -rw-r--r-- | src/phLibNfc.c | 5 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/phHal4Nfc.c b/src/phHal4Nfc.c index 3be1589..f40ed9b 100755 --- a/src/phHal4Nfc.c +++ b/src/phHal4Nfc.c @@ -357,8 +357,6 @@ NFCSTATUS phHal4Nfc_Open( NFCSTATUS openRetVal = NFCSTATUS_SUCCESS; phHal4Nfc_Hal4Ctxt_t *Hal4Ctxt = NULL; phHciNfc_Init_t eHciInitType = (phHciNfc_Init_t)InitType; - int rc; - /*Set Default Clock settings once*/ static phHal_sHwConfig_t sHwConfig = { {0}, @@ -379,13 +377,7 @@ NFCSTATUS phHal4Nfc_Open( else/*Do an initialization*/ { #ifdef ANDROID - rc = dlopen_firmware(); - if(rc < 0) - { - openRetVal = NFCSTATUS_FAILED; - pOpenCallback(pContext, openRetVal); - return openRetVal; - } + dlopen_firmware(); #endif /*If hal4 ctxt in Hwreference is NULL create a new context*/ diff --git a/src/phLibNfc.c b/src/phLibNfc.c index 63daaa2..6477a3f 100644 --- a/src/phLibNfc.c +++ b/src/phLibNfc.c @@ -230,16 +230,13 @@ NFCSTATUS phLibNfc_Mgt_Initialize(void *pDriverHandle, eInitDefault, phLibNfc_InitCb, (void *)gpphLibContext); - if(Status!=NFCSTATUS_FAILED) - { - phLibNfc_Ndef_Init(); - } } } else { Status = NFCSTATUS_INSUFFICIENT_RESOURCES; } + phLibNfc_Ndef_Init(); } } else if(gpphLibContext->LibNfcState.next_state==eLibNfcHalStateShutdown) |