--- a/drivers/usb/serial/usbserial.c +++ b/drivers/usb/serial/usbserial.c @@ -333,7 +333,7 @@ static __u16 vendor = 0x05f9; static __u16 product = 0xffff; static int maxSize = 0; -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ +static struct usb_device_id generic_device_ids[9]; /* Initially all zeroes. */ /* All of the device info needed for the Generic Serial Converter */ static struct usb_serial_device_type generic_device = { @@ -1836,6 +1836,30 @@ static int __init usb_serial_init(void) generic_device_ids[0].idVendor = vendor; generic_device_ids[0].idProduct = product; generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; + /* Option 3G/UMTS 'Colt' */ + generic_device_ids[1].idVendor = 0x0af0; + generic_device_ids[1].idProduct = 0x5000; + generic_device_ids[1].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; + /* Option 3G/UMTS 'Fusion' */ + generic_device_ids[2].idVendor = 0x0af0; + generic_device_ids[2].idProduct = 0x6000; + generic_device_ids[2].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; + /* Option 3G/UMTS 'Fusion2' */ + generic_device_ids[3].idVendor = 0x0af0; + generic_device_ids[3].idProduct = 0x6300; + generic_device_ids[3].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; + /* Audiovox Aircard */ + generic_device_ids[4].idVendor = 0x0f3d; + generic_device_ids[4].idProduct = 0x0112; + generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; + /* Huawei E600 */ + generic_device_ids[6].idVendor = 0x12d1; + generic_device_ids[6].idProduct = 0x1001; + generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; + /* Merlin XU870 */ + generic_device_ids[7].idVendor = 0x1410; + generic_device_ids[7].idProduct = 0x1430; + generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; /* register our generic driver with ourselves */ usb_serial_register (&generic_device); #endif