From: Johan Hovold <johan@kernel.org>
Date: Thu, 16 Mar 2017 16:13:33 +0000 (+0100)
Subject: USB: serial: relax generic driver bulk-endpoint requirement
X-Git-Tag: v4.14-rc1~993^2~9^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6538808c5619850cfedc9bee6d64d3793b31923d;p=platform%2Fkernel%2Flinux-rpi.git

USB: serial: relax generic driver bulk-endpoint requirement

Relax the generic driver bulk-endpoint requirement. The driver handles
devices without bulk-out endpoints just fine these days.

Signed-off-by: Johan Hovold <johan@kernel.org>
---

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 2d3599f..35cb8c0 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -52,10 +52,12 @@ static int usb_serial_generic_calc_num_ports(struct usb_serial *serial,
 					struct usb_serial_endpoints *epds)
 {
 	struct device *dev = &serial->interface->dev;
-	int num_ports = epds->num_bulk_out;
+	int num_ports;
+
+	num_ports = max(epds->num_bulk_in, epds->num_bulk_out);
 
 	if (num_ports == 0) {
-		dev_err(dev, "Generic device with no bulk out, not allowed.\n");
+		dev_err(dev, "device has no bulk endpoints\n");
 		return -ENODEV;
 	}