summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLidza Louina <lidza.louina@gmail.com>2013-08-21 21:48:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-22 10:12:42 -0700
commit17c82bce16e33b177c04ee38c85c09087a09bc80 (patch)
tree672e6e77fd123f90a0c075d1ff9afdc9c85516b2
parentbb9ebe70739c62322c26f22fac3c60998cfe56ec (diff)
staging: dgap: tty.c: fixes errors with tty function calls
This patch fixes errors with the tty function calls tty_buffer_request_room, tty_insert_flip_string_flags, tty_insert_flip_string and tty_flip_buffer_push. They now take struct tty_port as a parameter instead of tty_struct. Signed-off-by: Lidza Louina <lidza.louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/dgap/dgap_tty.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/dgap/dgap_tty.c b/drivers/staging/dgap/dgap_tty.c
index e7aea5ef51c5..4c3cc9460c75 100644
--- a/drivers/staging/dgap/dgap_tty.c
+++ b/drivers/staging/dgap/dgap_tty.c
@@ -881,20 +881,20 @@ void dgap_input(struct channel_t *ch)
if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) {
dgap_parity_scan(ch, ch->ch_bd->flipbuf, ch->ch_bd->flipflagbuf, &len);
- len = tty_buffer_request_room(tp, len);
- tty_insert_flip_string_flags(tp, ch->ch_bd->flipbuf,
+ len = tty_buffer_request_room(tp->port, len);
+ tty_insert_flip_string_flags(tp->port, ch->ch_bd->flipbuf,
ch->ch_bd->flipflagbuf, len);
}
else {
- len = tty_buffer_request_room(tp, len);
- tty_insert_flip_string(tp, ch->ch_bd->flipbuf, len);
+ len = tty_buffer_request_room(tp->port, len);
+ tty_insert_flip_string(tp->port, ch->ch_bd->flipbuf, len);
}
DGAP_UNLOCK(ch->ch_lock, lock_flags2);
DGAP_UNLOCK(bd->bd_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)