svn commit: r198634 - in stable/8/sys: . amd64/include/xen
cddl/contrib/opensolaris contrib/dev/acpica contrib/pf
dev/usb dev/usb/serial dev/xen/xenpci
Andrew Thompson
thompsa at FreeBSD.org
Thu Oct 29 23:11:14 UTC 2009
Author: thompsa
Date: Thu Oct 29 23:11:13 2009
New Revision: 198634
URL: http://svn.freebsd.org/changeset/base/198634
Log:
MFC r196493
- Fix false positive uipaq probe
Modified:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/usb/serial/uipaq.c
stable/8/sys/dev/usb/usb.h
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/serial/uipaq.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uipaq.c Thu Oct 29 23:10:41 2009 (r198633)
+++ stable/8/sys/dev/usb/serial/uipaq.c Thu Oct 29 23:11:13 2009 (r198634)
@@ -1103,6 +1103,10 @@ uipaq_probe(device_t dev)
if (uaa->info.bIfaceIndex != UIPAQ_IFACE_INDEX) {
return (ENXIO);
}
+ if (uaa->info.bInterfaceClass == UICLASS_IAD) {
+ DPRINTF("IAD detected - not UIPAQ serial device\n");
+ return (ENXIO);
+ }
return (usbd_lookup_id_by_uaa(uipaq_devs, sizeof(uipaq_devs), uaa));
}
Modified: stable/8/sys/dev/usb/usb.h
==============================================================================
--- stable/8/sys/dev/usb/usb.h Thu Oct 29 23:10:41 2009 (r198633)
+++ stable/8/sys/dev/usb/usb.h Thu Oct 29 23:11:13 2009 (r198634)
@@ -484,6 +484,8 @@ typedef struct usb_interface_assoc_descr
#define UISUBCLASS_RF 0x01
#define UIPROTO_BLUETOOTH 0x01
+#define UICLASS_IAD 0xEF /* Interface Association Descriptor */
+
#define UICLASS_APPL_SPEC 0xfe
#define UISUBCLASS_FIRMWARE_DOWNLOAD 1
#define UISUBCLASS_IRDA 2
More information about the svn-src-stable
mailing list