Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Johan Hovold <johan@kernel.org>

+2 -14
+2 -14
drivers/usb/serial/keyspan_pda.c
··· 708 708 MODULE_FIRMWARE("keyspan_pda/xircom_pgs.fw"); 709 709 #endif 710 710 711 - static int keyspan_pda_attach(struct usb_serial *serial) 712 - { 713 - unsigned char num_ports = serial->num_ports; 714 - 715 - if (serial->num_bulk_out < num_ports || 716 - serial->num_interrupt_in < num_ports) { 717 - dev_err(&serial->interface->dev, "missing endpoints\n"); 718 - return -ENODEV; 719 - } 720 - 721 - return 0; 722 - } 723 - 724 711 static int keyspan_pda_port_probe(struct usb_serial_port *port) 725 712 { 726 713 ··· 771 784 .description = "Keyspan PDA", 772 785 .id_table = id_table_std, 773 786 .num_ports = 1, 787 + .num_bulk_out = 1, 788 + .num_interrupt_in = 1, 774 789 .dtr_rts = keyspan_pda_dtr_rts, 775 790 .open = keyspan_pda_open, 776 791 .close = keyspan_pda_close, ··· 787 798 .break_ctl = keyspan_pda_break_ctl, 788 799 .tiocmget = keyspan_pda_tiocmget, 789 800 .tiocmset = keyspan_pda_tiocmset, 790 - .attach = keyspan_pda_attach, 791 801 .port_probe = keyspan_pda_port_probe, 792 802 .port_remove = keyspan_pda_port_remove, 793 803 };