commit 8b91e6c743a6926e3f67b035f8811c8a7665d751
author Hemant Gupta <hemantg@codeaurora.org> Fri Nov 22 20:53:53 2013 +0530
committer Matthew Xie <mattx@google.com> Tue May 06 01:14:23 2014 -0700
tree a8372125e8d1c3b0af40b72d03b643b8f75127b2
parent 0c88f8c0aa4de6e1aa022af12842a080b9e517da

HID: Handle connection failure in disconnecting state

This patch handles connectio error of interrupt channel while in
disconnecting state. Without this patch it was seen that upper
layers would not be informed about failure of interrupt channel
connection in this corner case leading to UI stuck at connecting
forever.

Change-Id: I1f5f18e70470eff17b21f2ed921edaefd3c89f9c

stack/hid/hidh_conn.c

diff --git a/stack/hid/hidh_conn.c b/stack/hid/hidh_conn.c
index 773bdb6..f464e36 100644
--- a/stack/hid/hidh_conn.c
+++ b/stack/hid/hidh_conn.c
@@ -388,7 +388,8 @@
     if ((p_hcon == NULL)
      || (!(p_hcon->conn_flags & HID_CONN_FLAGS_IS_ORIG))
      || ((l2cap_cid == p_hcon->ctrl_cid) && (p_hcon->conn_state != HID_CONN_STATE_CONNECTING_CTRL))
-     || ((l2cap_cid == p_hcon->intr_cid) && (p_hcon->conn_state != HID_CONN_STATE_CONNECTING_INTR)))
+     || ((l2cap_cid == p_hcon->intr_cid) && (p_hcon->conn_state != HID_CONN_STATE_CONNECTING_INTR)
+     && (p_hcon->conn_state != HID_CONN_STATE_DISCONNECTING)))
     {
         HIDH_TRACE_WARNING1 ("HID-Host Rcvd unexpected conn cnf, CID 0x%x ", l2cap_cid);
         return;