]> err.no Git - linux-2.6/commitdiff
USB: add Zoom Telephonics Model 3095F V.92 USB Mini External modem to cdc-acm
authorIain McFarlane <iain@imcfarla.homelinux.net>
Sat, 3 May 2008 23:13:49 +0000 (00:13 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 14 May 2008 17:00:27 +0000 (10:00 -0700)
The patch below is a necessary workaround to support the Zoom Telephonics Model 3095F V.92 USB Mini External modem, which fails to initialise properly during normal probing thus:

May  3 22:53:00 imcfarla kernel: drivers/usb/class/cdc-acm.c: Zero length descriptor references
May  3 22:53:00 imcfarla kernel: cdc_acm: probe of 5-2:1.0 failed with error -22

Adding the patch below causes the probing section to be skipped, and the modem
then initialises correctly.

Signed-off-by: Iain McFarlane <iain@imcfarla.homelinux.net>
Acked-by: Oliver Neukum <oneukum@suse.de>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/class/cdc-acm.c

index cefe7f2c6f750d5ac8ab3c0483b0a535cb22c273..63c34043b4d91e0bfb2864672704be838f518fef 100644 (file)
@@ -1248,6 +1248,9 @@ static struct usb_device_id acm_ids[] = {
        { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */
        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
        },
+       { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */
+       .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+       },
 
        /* control interfaces with various AT-command sets */
        { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,