From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Lidza Louina Subject: [PATCH 5/9] =?UTF-8?q?staging:=20dgnc:=20fixes=20error:=20expecte?= =?UTF-8?q?d=20=E2=80=98struct=20tty=5Fport=20*=E2=80=99=20but=20argument?= =?UTF-8?q?=20is=20of=20type=20=E2=80=98struct=20tty=5Fstruct=20*=E2=80=99?= Date: Mon, 12 Aug 2013 17:05:09 -0400 Message-Id: <1376341513-20578-6-git-send-email-lidza.louina@gmail.com> In-Reply-To: <1376341513-20578-1-git-send-email-lidza.louina@gmail.com> References: <1376341513-20578-1-git-send-email-lidza.louina@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-ID: To: driverdev-devel@linuxdriverproject.org, Greg KH , Mark Hounschell Cc: Lidza Louina Signed-off-by: Lidza Louina --- drivers/staging/dgnc/dgnc_tty.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 63b80e2..a00fe2b 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -870,7 +870,7 @@ void dgnc_input(struct channel_t *ch) } else { - len = tty_buffer_request_room(tp, len); + len = tty_buffer_request_room(tp->port, len); n = len; /* @@ -894,17 +894,17 @@ void dgnc_input(struct channel_t *ch) if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) { for (i = 0; i < s; i++) { if (*(ch->ch_equeue + tail + i) & UART_LSR_BI) - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_BREAK); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_BREAK); else if (*(ch->ch_equeue + tail + i) & UART_LSR_PE) - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_PARITY); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_PARITY); else if (*(ch->ch_equeue + tail + i) & UART_LSR_FE) - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_FRAME); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_FRAME); else - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_NORMAL); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_NORMAL); } } else { - tty_insert_flip_string(tp, ch->ch_rqueue + tail, s); + tty_insert_flip_string(tp->port, ch->ch_rqueue + tail, s); } dgnc_sniff_nowait_nolock(ch, "USER READ", ch->ch_rqueue + tail, s); @@ -921,7 +921,7 @@ void dgnc_input(struct channel_t *ch) DGNC_UNLOCK(ch->ch_lock, lock_flags); /* Tell the tty layer its okay to "eat" the data now */ - tty_flip_buffer_push(tp); + tty_flip_buffer_push(tp->port); } if (ld) -- 1.8.1.2