]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
USB: Allow initialization of broken keyspan serial adapters.
authorClark Rawlins <clark.rawlins@escient.com>
Thu, 27 Mar 2008 13:56:17 +0000 (09:56 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 2 Apr 2008 22:06:09 +0000 (15:06 -0700)
Fixes the keyspan driver after the addition of additional
checking of driver requirements introduced in usb-serial.c
commit 063a2da8f01806906f7d7b1a1424b9afddebc443.  The initialization
of the keyspan usb_serial_driver structs were not initializing the
num_interrupt_out field and the additional checking was rejecting
the end point so the driver wouldn't finish initializing.

This commit initializes the fields to NUM_DONT_CARE.
It works for the keyspan USA-49WG and doesn't break the USA-19HS
which are the two keyspan devices I have to test with.

Signed-off-by: Clark Rawlins <clark.rawlins@escient.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/keyspan.h

index 8a0d17401529986b077da08a15a292d1e2de14af..74ce8bca3e668422af542a6b709b3e762bc42418 100644 (file)
@@ -637,6 +637,7 @@ static struct usb_serial_driver keyspan_pre_device = {
        .description            = "Keyspan - (without firmware)",
        .id_table               = keyspan_pre_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
+       .num_interrupt_out      = NUM_DONT_CARE,
        .num_bulk_in            = NUM_DONT_CARE,
        .num_bulk_out           = NUM_DONT_CARE,
        .num_ports              = 1,
@@ -651,6 +652,7 @@ static struct usb_serial_driver keyspan_1port_device = {
        .description            = "Keyspan 1 port adapter",
        .id_table               = keyspan_1port_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
+       .num_interrupt_out      = NUM_DONT_CARE,
        .num_bulk_in            = NUM_DONT_CARE,
        .num_bulk_out           = NUM_DONT_CARE,
        .num_ports              = 1,
@@ -678,6 +680,7 @@ static struct usb_serial_driver keyspan_2port_device = {
        .description            = "Keyspan 2 port adapter",
        .id_table               = keyspan_2port_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
+       .num_interrupt_out      = NUM_DONT_CARE,
        .num_bulk_in            = NUM_DONT_CARE,
        .num_bulk_out           = NUM_DONT_CARE,
        .num_ports              = 2,
@@ -705,6 +708,7 @@ static struct usb_serial_driver keyspan_4port_device = {
        .description            = "Keyspan 4 port adapter",
        .id_table               = keyspan_4port_ids,
        .num_interrupt_in       = NUM_DONT_CARE,
+       .num_interrupt_out      = NUM_DONT_CARE,
        .num_bulk_in            = NUM_DONT_CARE,
        .num_bulk_out           = NUM_DONT_CARE,
        .num_ports              = 4,