From 2f092a5c9b1eda4ccea185ebd46d25a10503b43c Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 7 May 2010 19:46:56 +0200 Subject: [PATCH] --- yaml --- r: 195455 b: refs/heads/master c: 70ced221cc9f041481f129e63cc5b1dedb0ff959 h: refs/heads/master i: 195453: b9211a9d456775ea6f5b38770b23a9812e4cdd18 195451: 7ac17cd357124bae9ccf2efe542cf6f8685a48f7 195447: 300db77cdc23e5d158a8c381af58f28442f652d1 195439: fe13415fb073cafe62dacf9dd415a7e43934304d 195423: babe2f7d3e429061a641dc886626514444742ad6 195391: cf713ba71a29d0857ee4faa2f7071755a68fadc0 195327: 184b6469b15d6ca747b06b803f2d9bef1d0d2602 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/cypress_m8.c | 2 +- trunk/drivers/usb/serial/digi_acceleport.c | 4 ++-- trunk/drivers/usb/serial/spcp8x5.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 99ec01d93e55..bae22a8a8fe5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ab83238740ff1e1773d5c13ecac43c60cf4aec4 +refs/heads/master: 70ced221cc9f041481f129e63cc5b1dedb0ff959 diff --git a/trunk/drivers/usb/serial/cypress_m8.c b/trunk/drivers/usb/serial/cypress_m8.c index e23c77925e7a..582e832dca72 100644 --- a/trunk/drivers/usb/serial/cypress_m8.c +++ b/trunk/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/trunk/drivers/usb/serial/digi_acceleport.c b/trunk/drivers/usb/serial/digi_acceleport.c index 68b0aa5e516c..3edda3ed822a 100644 --- a/trunk/drivers/usb/serial/digi_acceleport.c +++ b/trunk/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/trunk/drivers/usb/serial/spcp8x5.c b/trunk/drivers/usb/serial/spcp8x5.c index 5d39191e7244..2ea32c561d02 100644 --- a/trunk/drivers/usb/serial/spcp8x5.c +++ b/trunk/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);