1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 7c9dc28640bb..81fc0dfcfdcf 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -868,7 +868,7 @@ static int usb_serial_probe(struct usb_interface *interface,
         max_endpoints = max(max_endpoints, (int)serial->num_ports);
         serial->num_port_pointers = max_endpoints;
 
-        dev_dbg(ddev, "setting up %d port structures for this device", max_endpoints);
+        dev_dbg(ddev, "setting up %d port structure(s)\n", max_endpoints);
         for (i = 0; i < max_endpoints; ++i) {
                 port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
                 if (!port)
@@ -923,9 +923,8 @@ static int usb_serial_probe(struct usb_interface *interface,
                 port = serial->port[i];
                 if (kfifo_alloc(&port->write_fifo, PAGE_SIZE, GFP_KERNEL))
                         goto probe_error;
-                buffer_size = serial->type->bulk_out_size;
-                if (!buffer_size)
-                        buffer_size = usb_endpoint_maxp(endpoint);
+                buffer_size = max_t(int, serial->type->bulk_out_size,
+                                                usb_endpoint_maxp(endpoint));
                 port->bulk_out_size = buffer_size;
                 port->bulk_out_endpointAddress = endpoint->bEndpointAddress;
 
@@ -1034,7 +1033,7 @@ static int usb_serial_probe(struct usb_interface *interface,
         for (i = 0; i < num_ports; ++i) {
                 port = serial->port[i];
                 dev_set_name(&port->dev, "ttyUSB%d", port->minor);
-                dev_dbg(ddev, "registering %s", dev_name(&port->dev));
+                dev_dbg(ddev, "registering %s\n", dev_name(&port->dev));
                 device_enable_async_suspend(&port->dev);
 
                 retval = device_add(&port->dev);
@@ -1161,9 +1160,9 @@ static int usb_serial_reset_resume(struct usb_interface *intf)
         usb_serial_unpoison_port_urbs(serial);
 
         serial->suspending = 0;
-        if (serial->type->reset_resume)
+        if (serial->type->reset_resume) {
                 rv = serial->type->reset_resume(serial);
-        else {
+        } else {
                 rv = -EOPNOTSUPP;
                 intf->needs_binding = 1;
         }
@@ -1338,9 +1337,9 @@ static int usb_serial_register(struct usb_serial_driver *driver)
         if (retval) {
                 pr_err("problem %d when registering driver %s\n", retval, driver->description);
                 list_del(&driver->driver_list);
-        } else
+        } else {
                 pr_info("USB Serial support registered for %s\n", driver->description);
-
+        }
         mutex_unlock(&table_lock);
         return retval;
 }