From owner-p4-projects@FreeBSD.ORG  Sat Oct 25 11:31:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C19EB1065673; Sat, 25 Oct 2008 11:31:42 +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 856CC1065671
	for <perforce@FreeBSD.org>; Sat, 25 Oct 2008 11:31:42 +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 736BC8FC13
	for <perforce@FreeBSD.org>; Sat, 25 Oct 2008 11:31:42 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9PBVg0i030943
	for <perforce@FreeBSD.org>; Sat, 25 Oct 2008 11:31:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PBVgNT030941
	for perforce@freebsd.org; Sat, 25 Oct 2008 11:31:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 25 Oct 2008 11:31:42 GMT
Message-Id: <200810251131.m9PBVgNT030941@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 151900 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: Sat, 25 Oct 2008 11:31:43 -0000

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

Change 151900 by hselasky@hselasky_laptop001 on 2008/10/25 11:31:21

	
	Not all modems have capabilities.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#9 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#9 (text+ko) ====

@@ -115,9 +115,9 @@
 		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
 	USB_IFACE_PROTOCOL(UIPROTO_CDC_AT)},
 	/* Kyocera AH-K3001V */
-	{USB_VPI(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, 0)},
-	{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, 0)},
-	{USB_VPI(USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_PC5740, 0)},
+	{USB_VPI(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, 1)},
+	{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, 1)},
+	{USB_VPI(USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_PC5740, 1)},
 };
 
 /*
@@ -297,6 +297,10 @@
 	if (error) {
 		return (error);
 	}
+	if (uaa->driver_info == NULL) {
+		/* some modems do not have any capabilities */
+		return (error);
+	}
 	umodem_get_caps(uaa, &cm, &acm);
 	if (!(cm & USB_CDC_CM_DOES_CM) ||
 	    !(cm & USB_CDC_CM_OVER_DATA) ||