Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82247053 authored by Clark Rawlins's avatar Clark Rawlins Committed by Greg Kroah-Hartman
Browse files

USB: Allow initialization of broken keyspan serial adapters. 



Fixes the keyspan driver after the addition of additional
checking of driver requirements introduced in usb-serial.c
commit 063a2da8.  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: default avatarClark Rawlins <clark.rawlins@escient.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4756febb

drivers/usb/serial/keyspan.h

+4 −0
Original line number Diff line number Diff line
@@ -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,