Index: src/hci.c
===================================================================
RCS file: /cvsroot/bluez/libs/src/hci.c,v
retrieving revision 1.81
diff -u -r1.81 hci.c
--- src/hci.c	22 Sep 2005 23:10:48 -0000	1.81
+++ src/hci.c	20 Oct 2005 08:13:12 -0000
@@ -972,6 +972,12 @@
 			if (cs->opcode != opcode)
 				continue;
 
+			if (hdr->evt == r->event) {
+				r->rlen = MIN(len, r->rlen);
+				memcpy(r->rparam, ptr, r->rlen);
+				goto done;
+			}
+
 			if (cs->status) {
 				errno = EIO;
 				goto failed;