From 837efc3194a03beaaa32b370c63a9270ed9664d8 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Tue, 5 Mar 2013 17:17:20 -0800 Subject: 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 --- src/phFriNfc_LlcpTransport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/phFriNfc_LlcpTransport.c') 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; -- cgit v1.2.3