PERFORCE change 151900 for review

[Hans Petter Selasky]

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

Change 151900 by hselasky at 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) ||