From owner-p4-projects@FreeBSD.ORG  Tue Aug 18 15:57:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 589D0106568D; Tue, 18 Aug 2009 15:57:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1CF101065692
	for <perforce@FreeBSD.org>; Tue, 18 Aug 2009 15:57:11 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B71698FC6C
	for <perforce@FreeBSD.org>; Tue, 18 Aug 2009 15:57:10 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7IFvADx072471
	for <perforce@FreeBSD.org>; Tue, 18 Aug 2009 15:57:10 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7IFvAAj072469
	for perforce@freebsd.org; Tue, 18 Aug 2009 15:57:10 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 18 Aug 2009 15:57:10 GMT
Message-Id: <200908181557.n7IFvAAj072469@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167478 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Aug 2009 15:57:11 -0000

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