diff options
| author | Johan Hovold <jhovold@gmail.com> | 2010-05-07 19:46:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 13:21:43 -0700 |
| commit | 70ced221cc9f041481f129e63cc5b1dedb0ff959 (patch) | |
| tree | 646401a37dbc21cb3a8549feb867e60d491a9bfd /drivers/usb/serial/spcp8x5.c | |
| parent | 1ab83238740ff1e1773d5c13ecac43c60cf4aec4 (diff) | |
| download | talos-obmc-linux-70ced221cc9f041481f129e63cc5b1dedb0ff959.tar.gz talos-obmc-linux-70ced221cc9f041481f129e63cc5b1dedb0ff959.zip | |
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>
Diffstat (limited to 'drivers/usb/serial/spcp8x5.c')
| -rw-r--r-- | drivers/usb/serial/spcp8x5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c index 5d39191e7244..2ea32c561d02 100644 --- 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); |
