patch-2.4.20 linux-2.4.20/net/bluetooth/hci_event.c

• Lines: 30
• Date: Thu Nov 28 15:53:15 2002
• Orig file: linux-2.4.19/net/bluetooth/hci_event.c
• Orig date: Fri Aug 2 17:39:46 2002

diff -urN linux-2.4.19/net/bluetooth/hci_event.c linux-2.4.20/net/bluetooth/hci_event.c
@@ -25,7 +25,7 @@
 /*
  * HCI Events.
  *
- * $Id: hci_event.c,v 1.3 2002/04/17 17:37:16 maxk Exp $
+ * $Id: hci_event.c,v 1.4 2002/07/27 18:14:38 maxk Exp $
  */
 
 #include <linux/config.h>
@@ -352,16 +352,12 @@
 			hci_dev_lock(hdev);
 	
 			acl = conn_hash_lookup_handle(hdev, handle);
-			if (!acl || !(sco = acl->link)) {
-				hci_dev_unlock(hdev);
-				break;
+			if (acl && (sco = acl->link)) {
+				sco->state = BT_CLOSED;
+				hci_proto_connect_cfm(sco, status);
+				hci_conn_del(sco);
 			}
 
-			sco->state = BT_CLOSED;
-
-			hci_proto_connect_cfm(sco, status);
-			hci_conn_del(sco);
-
 			hci_dev_unlock(hdev);
 		}
 		break;