summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/usb-serial.c
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-03-16 19:13:32 +0300
committerJohan Hovold <johan@kernel.org>2017-03-28 11:54:39 +0300
commita794499b261b8487a984783ccc864975e1bcc7bf (patch)
tree57dfa404104d6fd86e756c1c10dd5d1ff3e9143b /drivers/usb/serial/usb-serial.c
parent415d7b3a5407d91fdf47a07fd31d63e4b548651f (diff)
downloadlinux-a794499b261b8487a984783ccc864975e1bcc7bf.tar.xz
USB: serial: add calc_num_ports callback to generic driver
Add a calc_num_ports callback to the generic driver and verify that the device has the required endpoints there instead of in core. Note that the generic driver num_ports field was never used. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r--drivers/usb/serial/usb-serial.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index f8ae09e2cff5..101eb105d78e 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -850,28 +850,17 @@ static int usb_serial_probe(struct usb_interface *interface,
retval = -ENODEV;
goto err_free_epds;
}
-#ifdef CONFIG_USB_SERIAL_GENERIC
- if (type == &usb_serial_generic_device) {
- num_ports = epds->num_bulk_out;
- if (num_ports == 0) {
- dev_err(ddev, "Generic device with no bulk out, not allowed.\n");
- retval = -EIO;
+
+ if (type->calc_num_ports) {
+ retval = type->calc_num_ports(serial, epds);
+ if (retval < 0)
goto err_free_epds;
- }
- }
-#endif
- if (!num_ports) {
- /* if this device type has a calc_num_ports function, call it */
- if (type->calc_num_ports) {
- retval = type->calc_num_ports(serial, epds);
- if (retval < 0)
- goto err_free_epds;
- num_ports = retval;
- }
- if (!num_ports)
- num_ports = type->num_ports;
+ num_ports = retval;
}
+ if (!num_ports)
+ num_ports = type->num_ports;
+
if (num_ports > MAX_NUM_PORTS) {
dev_warn(ddev, "too many ports requested: %d\n", num_ports);
num_ports = MAX_NUM_PORTS;