1 files changed, 23 insertions, 6 deletions

diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 2cf64e0ec956..0f0756cf79c7 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1177,12 +1177,28 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
 
 	dd = usbd_get_device_descriptor(udev);
 
-	/*
-	 * These are radio devices with auto-install flash disks for win/mac.
- 	 * We want the ubsa driver to kick them into shape instead.
+	/* These are 3G modes (E220, Mobile, etc.) devices with auto-install
+	 * flash disks for Windows/MacOSX through the first interface.
+	 * We are assuming that these vendors will not produce mass storage
+	 * devices. See the list of supported parts in u3g, if this happens to
+	 * be a mistake in the future.
 	 */
-	if (UGETW(dd->idVendor) == USB_VENDOR_HUAWEI)
-		return(UMATCH_NONE);
+	if (UGETW(dd->idVendor) == USB_VENDOR_HUAWEI) {
+		/* The interface is reset in the u3g driver
+		 * (u3g_huawei_reinit()). Allow generic attachment to the
+		 * second interface though. Some Huawei devices contain an SD
+		 * card slot.
+		 */
+		id = usbd_get_interface_descriptor(iface);
+		if (id == NULL || id->bInterfaceNumber == 0)
+			return UMATCH_NONE;
+	} else if (UGETW(dd->idVendor) == USB_VENDOR_QUALCOMMINC
+		   || UGETW(dd->idVendor) == USB_VENDOR_NOVATEL) {
+		/* Device by these vendors will automatically reappear as a
+		 * ucom device if ignored (or if sent an eject command).
+		 */
+		return UMATCH_NONE;
+	}
 
 	/* An entry specifically for Y-E Data devices as they don't fit in the
 	 * device description table.
@@ -1279,7 +1295,7 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
 		return(UMATCH_NONE);
 	}
 
-	return(UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO);
+	return(UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO);
 }
 
 static int
@@ -1291,6 +1307,7 @@ umass_match(device_t self)
 	sc->sc_dev = self;
 	if (uaa->iface == NULL)
 		return(UMATCH_NONE);
+	
 	return(umass_match_proto(sc, uaa->iface, uaa->device));
 }