summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2020-01-22 11:15:30 +0100
committerJohan Hovold <johan@kernel.org>2020-01-23 09:11:36 +0100
commita1c91c1036397f2f7074aa4f5df8a2412e94ab97 (patch)
tree9890ab7d9524e32388a20203e5846ec30dd9d420
parentUSB: serial: ir-usb: make set_termios synchronous (diff)
downloadlinux-a1c91c1036397f2f7074aa4f5df8a2412e94ab97.tar.xz
linux-a1c91c1036397f2f7074aa4f5df8a2412e94ab97.zip
USB: serial: ir-usb: simplify endpoint check
Simplify the endpoint sanity check by letting core verify that the required endpoints are present. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Johan Hovold <johan@kernel.org>
-rw-r--r--drivers/usb/serial/ir-usb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 3cd70392e2a2..79d0586e2b33 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -76,6 +76,8 @@ static struct usb_serial_driver ir_device = {
.description = "IR Dongle",
.id_table = ir_id_table,
.num_ports = 1,
+ .num_bulk_in = 1,
+ .num_bulk_out = 1,
.set_termios = ir_set_termios,
.attach = ir_startup,
.write = ir_write,
@@ -197,9 +199,6 @@ static int ir_startup(struct usb_serial *serial)
struct usb_irda_cs_descriptor *irda_desc;
int rates;
- if (serial->num_bulk_in < 1 || serial->num_bulk_out < 1)
- return -ENODEV;
-
irda_desc = irda_usb_find_class_desc(serial, 0);
if (!irda_desc) {
dev_err(&serial->dev->dev,