Merge tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[platform/kernel/linux-rpi.git] / drivers / usb / serial / ftdi_sio.c

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 31b9b36..05e28a5 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1108,7 +1108,8 @@ static const char *ftdi_chip_name[] = {
 /* End TIOCMIWAIT */
 
 static void ftdi_set_termios(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct ktermios *old);
+                            struct usb_serial_port *port,
+                            const struct ktermios *old_termios);
 static int ftdi_get_modem_status(struct usb_serial_port *port,
                                                unsigned char status[2]);
 
@@ -2598,7 +2599,8 @@ static bool ftdi_tx_empty(struct usb_serial_port *port)
  * WARNING: set_termios calls this with old_termios in kernel space
  */
 static void ftdi_set_termios(struct tty_struct *tty,
-               struct usb_serial_port *port, struct ktermios *old_termios)
+                            struct usb_serial_port *port,
+                            const struct ktermios *old_termios)
 {
        struct usb_device *dev = port->serial->dev;
        struct device *ddev = &port->dev;