USB: tty: fix incorrect use of tty_insert_flip_string_fixed_flag

Fix regression introduced by commit
a108bfcb372d8c4452701039308fb95747911c59 (USB: tty: Prune uses of
tty_request_room in the USB layer) which broke three drivers
(cypress_m8, digi_acceleport and spcp8x5) through incorrect use of
tty_insert_flip_string_fixed_flag.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Cc: stable <stable@kernel.org>  [.34]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index e23c77925e7a45445e6c39f4bf4b75b69cad5b6c..582e832dca72d1f185e6dfea849c9458edd4a868 100644 (file)
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1309,7 +1309,7 @@ static void cypress_read_int_callback(struct urb *urb)
        /* process read if there is data other than line status */
        if (tty && bytes > i) {
                tty_insert_flip_string_fixed_flag(tty, data + i,
-                               bytes - i, tty_flag);
+                               tty_flag, bytes - i);
                tty_flip_buffer_push(tty);
        }
 

diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 68b0aa5e516c2deb0036790a61ff2a7e1039e19a..3edda3ed822a5326e1072e3f49bc163af2878dae 100644 (file)
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1703,8 +1703,8 @@ static int digi_read_inb_callback(struct urb *urb)
                /* data length is len-1 (one byte of len is port_status) */
                --len;
                if (len > 0) {
-                       tty_insert_flip_string_fixed_flag(tty, data, len,
-                                                                       flag);
+                       tty_insert_flip_string_fixed_flag(tty, data, flag,
+                                                                       len);
                        tty_flip_buffer_push(tty);
                }
        }

diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 5d39191e7244bb0f645ca5b124da4deaba9ac97d..2ea32c561d02ef933ae47658ba7780c52918c80e 100644 (file)
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -726,8 +726,8 @@ static void spcp8x5_read_bulk_callback(struct urb *urb)
                /* overrun is special, not associated with a char */
                if (status & UART_OVERRUN_ERROR)
                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-               tty_insert_flip_string_fixed_flag(tty, data,
-                                               urb->actual_length, tty_flag);
+               tty_insert_flip_string_fixed_flag(tty, data, tty_flag,
+                                                       urb->actual_length);
                tty_flip_buffer_push(tty);
        }
        tty_kref_put(tty);