diff options
| author | Martijn Coenen <maco@google.com> | 2013-03-05 17:17:20 -0800 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-03-05 17:32:58 -0800 |
| commit | 837efc3194a03beaaa32b370c63a9270ed9664d8 (patch) | |
| tree | 884477a467dc78a5e1658b7a437a35c98c3e324e /src/phFriNfc_LlcpTransport.c | |
| parent | 7c4b4fadb66959c50c170182847886e83393eebf (diff) | |
| download | libnfc-nxp-837efc3194a03beaaa32b370c63a9270ed9664d8.tar.gz | |
Fix wrong callback being cleared.
When a call to disconnect() failed, the
connect() callback was cleared, not the
disconnect() one. This would cause deadlocks,
where JNI threads were forever blocked on
doConnect().
Bug: 7324226
Change-Id: I784c8d700c87d643315f2417610ca75ef8f9aa7c
Diffstat (limited to 'src/phFriNfc_LlcpTransport.c')
| -rw-r--r-- | src/phFriNfc_LlcpTransport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/phFriNfc_LlcpTransport.c b/src/phFriNfc_LlcpTransport.c index b3aee54..447eae6 100644 --- a/src/phFriNfc_LlcpTransport.c +++ b/src/phFriNfc_LlcpTransport.c @@ -687,7 +687,7 @@ NFCSTATUS phFriNfc_LlcpTransport_Reset (phFriNfc_LlcpTransport_t *pLlcpTran pLlcpTransport->pSocketTable[i].pAcceptContext = NULL; pLlcpTransport->pSocketTable[i].pRejectContext = NULL; pLlcpTransport->pSocketTable[i].pConnectContext = NULL; - pLlcpTransport->pSocketTable[i].pDisonnectContext = NULL; + pLlcpTransport->pSocketTable[i].pDisconnectContext = NULL; pLlcpTransport->pSocketTable[i].pSendContext = NULL; pLlcpTransport->pSocketTable[i].pRecvContext = NULL; pLlcpTransport->pSocketTable[i].pSocketErrCb = NULL; |