diff options
author | Johan Hovold <jhovold@gmail.com> | 2010-05-07 13:46:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:43 -0400 |
commit | 70ced221cc9f041481f129e63cc5b1dedb0ff959 (patch) | |
tree | 646401a37dbc21cb3a8549feb867e60d491a9bfd /drivers/usb/serial/digi_acceleport.c | |
parent | 1ab83238740ff1e1773d5c13ecac43c60cf4aec4 (diff) |
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/digi_acceleport.c')
-rw-r--r-- | drivers/usb/serial/digi_acceleport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 68b0aa5e516..3edda3ed822 100644 --- 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) | |||
1703 | /* data length is len-1 (one byte of len is port_status) */ | 1703 | /* data length is len-1 (one byte of len is port_status) */ |
1704 | --len; | 1704 | --len; |
1705 | if (len > 0) { | 1705 | if (len > 0) { |
1706 | tty_insert_flip_string_fixed_flag(tty, data, len, | 1706 | tty_insert_flip_string_fixed_flag(tty, data, flag, |
1707 | flag); | 1707 | len); |
1708 | tty_flip_buffer_push(tty); | 1708 | tty_flip_buffer_push(tty); |
1709 | } | 1709 | } |
1710 | } | 1710 | } |