Commit "TTY: switch tty_flip_buffer_push" and "TTY: convert more flipping functions" switched tty_flip_buffer_push() and tty_prepare_flip_string() to take tty_port rather than a tty_struct.
Convert the metag_da tty driver similarly. Signed-off-by: James Hogan <[email protected]> Cc: Jiri Slaby <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> --- drivers/tty/metag_da.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/metag_da.c b/drivers/tty/metag_da.c index 6a0b2e6..fc2a36b 100644 --- a/drivers/tty/metag_da.c +++ b/drivers/tty/metag_da.c @@ -163,13 +163,14 @@ static int fetch_data(struct tty_struct *tty) int space; unsigned char *cbuf; - space = tty_prepare_flip_string(tty, &cbuf, received); + space = tty_prepare_flip_string(&dport->port, &cbuf, + received); if (space <= 0) goto unlock; memcpy(cbuf, dport->rx_buf, space); - tty_flip_buffer_push(tty); + tty_flip_buffer_push(&dport->port); } } unlock: -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
