Skip to content

Commit

Permalink
USB: tty: fix incorrect use of tty_insert_flip_string_fixed_flag
Browse files Browse the repository at this point in the history
Fix regression introduced by commit
a108bfc (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>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed May 20, 2010
1 parent 1ab8323 commit 70ced22
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/serial/cypress_m8.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/serial/digi_acceleport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/serial/spcp8x5.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 70ced22

Please sign in to comment.