Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Aug 2009 15:57:10 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 167478 for review
Message-ID:  <200908181557.n7IFvAAj072469@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help

http://perforce.freebsd.org/chv.cgi?CH=167478

Change 167478 by hselasky@hselasky_laptop001 on 2009/08/18 15:57:09

	
	USB serial:
	 - Fix false positive uipaq probe
	 - Reported by: Alexander Motin <mav@freebsd.org>

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#44 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#13 (text+ko) ====

@@ -1103,6 +1103,10 @@
 	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));
 }
 

==== //depot/projects/usb/src/sys/dev/usb/usb.h#44 (text+ko) ====

@@ -484,6 +484,8 @@
 #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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908181557.n7IFvAAj072469>