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

Commit b714d5dc authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: keyspan_pda: simplify endpoint check 



Simplify the endpoint sanity check by letting core verify that the
required endpoints are present.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent fb527736

drivers/usb/serial/keyspan_pda.c

+2 −14
Original line number Diff line number Diff line
@@ -708,19 +708,6 @@ MODULE_FIRMWARE("keyspan_pda/keyspan_pda.fw"); 
MODULE_FIRMWARE("keyspan_pda/xircom_pgs.fw");

#endif



static int keyspan_pda_attach(struct usb_serial *serial)

{

	unsigned char num_ports = serial->num_ports;



	if (serial->num_bulk_out < num_ports ||

			serial->num_interrupt_in < num_ports) {

		dev_err(&serial->interface->dev, "missing endpoints\n");

		return -ENODEV;

	}



	return 0;

}



static int keyspan_pda_port_probe(struct usb_serial_port *port)

{
@@ -784,6 +771,8 @@ static struct usb_serial_driver keyspan_pda_device = { 
	.description =		"Keyspan PDA",

	.id_table =		id_table_std,

	.num_ports =		1,

	.num_bulk_out =		1,

	.num_interrupt_in =	1,

	.dtr_rts =		keyspan_pda_dtr_rts,

	.open =			keyspan_pda_open,

	.close =		keyspan_pda_close,
@@ -798,7 +787,6 @@ static struct usb_serial_driver keyspan_pda_device = { 
	.break_ctl =		keyspan_pda_break_ctl,

	.tiocmget =		keyspan_pda_tiocmget,

	.tiocmset =		keyspan_pda_tiocmset,

	.attach =		keyspan_pda_attach,

	.port_probe =		keyspan_pda_port_probe,

	.port_remove =		keyspan_pda_port_remove,

};