hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: tty: fix incorrect use of tty_insert_flip_string_fixed_flag 

Fix regression introduced by commit
a108bfcb37 (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>
This commit is contained in:
Johan Hovold 2010-05-07 19:46:56 +02:00 committed by Greg Kroah-Hartman
parent 1ab8323874
commit 70ced221cc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/serial/cypress_m8.c
View File

@ -1309,7 +1309,7 @@ static void cypress_read_int_callback(struct urb *urb)
/* process read if there is data other than line status */ /* process read if there is data other than line status */
if (tty && bytes > i) { if (tty && bytes > i) {
tty_insert_flip_string_fixed_flag(tty, data + i, tty_insert_flip_string_fixed_flag(tty, data + i,
bytes - i, tty_flag); tty_flag, bytes - i);
tty_flip_buffer_push(tty); tty_flip_buffer_push(tty);
} }

4
drivers/usb/serial/digi_acceleport.c
View File

@ -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) */ /* data length is len-1 (one byte of len is port_status) */
--len; --len;
if (len > 0) { if (len > 0) {
tty_insert_flip_string_fixed_flag(tty, data, len, tty_insert_flip_string_fixed_flag(tty, data, flag,
flag); len);
tty_flip_buffer_push(tty); tty_flip_buffer_push(tty);
} }
} }

4
drivers/usb/serial/spcp8x5.c
View File

@ -726,8 +726,8 @@ static void spcp8x5_read_bulk_callback(struct urb *urb)
/* overrun is special, not associated with a char */ /* overrun is special, not associated with a char */
if (status & UART_OVERRUN_ERROR) if (status & UART_OVERRUN_ERROR)
tty_insert_flip_char(tty, 0, TTY_OVERRUN); tty_insert_flip_char(tty, 0, TTY_OVERRUN);
tty_insert_flip_string_fixed_flag(tty, data, tty_insert_flip_string_fixed_flag(tty, data, tty_flag,
urb->actual_length, tty_flag); urb->actual_length);
tty_flip_buffer_push(tty); tty_flip_buffer_push(tty);
} }
tty_kref_put(tty); tty_kref_put(tty);