diff options
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/dgrp/dgrp_net_ops.c | 2 | ||||
| -rw-r--r-- | drivers/staging/fwserial/fwserial.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/dgrp/dgrp_net_ops.c b/drivers/staging/dgrp/dgrp_net_ops.c index c0aeaaa094f1..df3ebcdf7ed8 100644 --- a/drivers/staging/dgrp/dgrp_net_ops.c +++ b/drivers/staging/dgrp/dgrp_net_ops.c @@ -232,7 +232,7 @@ static void dgrp_input(struct ch_struct *ch) (nd->nd_dpa_port == PORT_NUM(MINOR(tty_devnum(tty))))) dgrp_dpa_data(nd, 1, myflipbuf, len); - tty_insert_flip_string_flags(tty, myflipbuf, + tty_insert_flip_string_flags(&ch->port, myflipbuf, myflipflagbuf, len); tty_flip_buffer_push(tty); diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c index 61ee29083b26..85dbdc1eccec 100644 --- a/drivers/staging/fwserial/fwserial.c +++ b/drivers/staging/fwserial/fwserial.c @@ -507,7 +507,8 @@ static void fwtty_emit_breaks(struct work_struct *work) while (n) { t = min(n, 16); - c = tty_insert_flip_string_fixed_flag(tty, buf, TTY_BREAK, t); + c = tty_insert_flip_string_fixed_flag(&port->port, buf, + TTY_BREAK, t); n -= c; brk += c; if (c < t) @@ -535,7 +536,7 @@ static void fwtty_pushrx(struct work_struct *work) spin_lock_bh(&port->lock); list_for_each_entry_safe(buf, next, &port->buf_list, list) { - n = tty_insert_flip_string_fixed_flag(tty, buf->data, + n = tty_insert_flip_string_fixed_flag(&port->port, buf->data, TTY_NORMAL, buf->n); c += n; port->buffered -= n; @@ -630,7 +631,8 @@ static int fwtty_rx(struct fwtty_port *port, unsigned char *data, size_t len) } if (!test_bit(BUFFERING_RX, &port->flags)) { - c = tty_insert_flip_string_fixed_flag(tty, data, TTY_NORMAL, n); + c = tty_insert_flip_string_fixed_flag(&port->port, data, + TTY_NORMAL, n); if (c > 0) tty_flip_buffer_push(tty); n -= c; |