]> err.no Git - linux-2.6/commitdiff
USB: remove broken usb-serial num_endpoints check
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Apr 2008 21:17:29 +0000 (14:17 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Apr 2008 05:30:53 +0000 (22:30 -0700)
The num_interrupt_in, num_bulk_in, and other checks in the usb-serial
code are just wrong, there are too many different devices out there with
different numbers of endpoints.  We need to just be sticking with the
device ids instead of trying to catch this kind of thing.  It broke too
many different devices.

This fixes a large number of usb-serial devices to get them working
properly again.

Cc: Oliver Neukum <oliver@neukum.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/usb-serial.c

index 3ce98e8d7bce6103031af188dc56218693f8ac51..2138ba8aeb697b2e35ee04d5e62e6f008bdb0c47 100644 (file)
@@ -854,6 +854,7 @@ int usb_serial_probe(struct usb_interface *interface,
        serial->num_interrupt_in = num_interrupt_in;
        serial->num_interrupt_out = num_interrupt_out;
 
+#if 0
        /* check that the device meets the driver's requirements */
        if ((type->num_interrupt_in != NUM_DONT_CARE &&
                                type->num_interrupt_in != num_interrupt_in)
@@ -867,6 +868,7 @@ int usb_serial_probe(struct usb_interface *interface,
                kfree(serial);
                return -EIO;
        }
+#endif
 
        /* found all that we need */
        dev_info(&interface->dev, "%s converter detected\n",