aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2014-06-05 10:05:54 -0400
committerJohan Hovold <johan@kernel.org>2014-07-07 04:10:33 -0400
commita90d84adb43936f66ede77794940dc27156d58da (patch)
tree4fff7c5b07f03bea6175fc05ff91768a018ff32b /drivers/usb/serial/ftdi_sio.c
parentaf6f9e8355b2200df1ed077bc1b8ebf6b4592b01 (diff)
USB: ftdi_sio: fix max-packet-size warning
Promote max-packet-size-override message to warning level and use the port device for logging, while using actual endpoint numbers in the message itself. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index ca84d2cdd655..6cfa55a2f804 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1563,8 +1563,6 @@ static void ftdi_set_max_packet_size(struct usb_serial_port *port)
1563{ 1563{
1564 struct ftdi_private *priv = usb_get_serial_port_data(port); 1564 struct ftdi_private *priv = usb_get_serial_port_data(port);
1565 struct usb_serial *serial = port->serial; 1565 struct usb_serial *serial = port->serial;
1566 struct usb_device *udev = serial->dev;
1567
1568 struct usb_interface *interface = serial->interface; 1566 struct usb_interface *interface = serial->interface;
1569 struct usb_endpoint_descriptor *ep_desc; 1567 struct usb_endpoint_descriptor *ep_desc;
1570 1568
@@ -1583,7 +1581,8 @@ static void ftdi_set_max_packet_size(struct usb_serial_port *port)
1583 ep_desc = &interface->cur_altsetting->endpoint[i].desc; 1581 ep_desc = &interface->cur_altsetting->endpoint[i].desc;
1584 if (ep_desc->wMaxPacketSize == 0) { 1582 if (ep_desc->wMaxPacketSize == 0) {
1585 ep_desc->wMaxPacketSize = cpu_to_le16(0x40); 1583 ep_desc->wMaxPacketSize = cpu_to_le16(0x40);
1586 dev_info(&udev->dev, "Overriding wMaxPacketSize on endpoint %d\n", i); 1584 dev_warn(&port->dev, "Overriding wMaxPacketSize on endpoint %d\n",
1585 usb_endpoint_num(ep_desc));
1587 } 1586 }
1588 } 1587 }
1589 1588