Commit d9b1b787 authored by Johannes Hölzl's avatar Johannes Hölzl Committed by Greg Kroah-Hartman
Browse files

USB serial: add driver pointer to all usb-serial drivers 



Every usb serial driver should have a pointer to the corresponding usb driver.
So the usb serial core can add a new id not only to the usb serial driver, but
also to the usb driver.

Also the usb drivers of ark3116, mos7720 and mos7840 missed the flag
no_dynamic_id=1. This is added now.

Signed-off-by: default avatarJohannes Hölzl <johannes.hoelzl@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 93bacefc

drivers/usb/serial/aircable.c

+9 −7
Original line number Diff line number Diff line
@@ -572,8 +572,17 @@ static void aircable_unthrottle(struct usb_serial_port *port) 
		schedule_work(&priv->rx_work);

}



static struct usb_driver aircable_driver = {

	.name =		"aircable",

	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table,

	.no_dynamic_id =	1,

};



static struct usb_serial_driver aircable_device = {

	.description =		"aircable",

	.usb_driver = 		&aircable_driver,

	.id_table = 		id_table,

	.num_ports =		1,

	.attach =		aircable_attach,
@@ -587,13 +596,6 @@ static struct usb_serial_driver aircable_device = { 
	.unthrottle =		aircable_unthrottle,

};



static struct usb_driver aircable_driver = {

	.name =		"aircable",

	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table,

};



static int __init aircable_init (void)

{

	int retval;

drivers/usb/serial/airprime.c

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ static struct usb_serial_driver airprime_device = { 
		.owner =	THIS_MODULE,

		.name =		"airprime",

	},

	.usb_driver =		&airprime_driver,

	.id_table =		id_table,

	.num_interrupt_in =	NUM_DONT_CARE,

	.num_bulk_in =		NUM_DONT_CARE,

drivers/usb/serial/ark3116.c

+2 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ static struct usb_driver ark3116_driver = { 
	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table,

	.no_dynamic_id =	1,

};



static struct usb_serial_driver ark3116_device = {
@@ -452,6 +453,7 @@ static struct usb_serial_driver ark3116_device = { 
		.name =		"ark3116",

	},

	.id_table =		id_table,

	.usb_driver =		&ark3116_driver,

	.num_interrupt_in =	1,

	.num_bulk_in =		1,

	.num_bulk_out =		1,

drivers/usb/serial/belkin_sa.c

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static struct usb_serial_driver belkin_device = { 
		.name =		"belkin",

	},

	.description =		"Belkin / Peracom / GoHubs USB Serial Adapter",

	.usb_driver =		&belkin_driver,

	.id_table =		id_table_combined,

	.num_interrupt_in =	1,

	.num_bulk_in =		1,

drivers/usb/serial/cp2101.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static struct usb_serial_driver cp2101_device = { 
		.owner =	THIS_MODULE,

		.name = 	"cp2101",

	},

	.usb_driver		= &cp2101_driver,

	.id_table		= id_table,

	.num_interrupt_in	= 0,

	.num_bulk_in		= 0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE