aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/hvc/hvcs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/hvc/hvcs.c')
-rw-r--r--drivers/tty/hvc/hvcs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 877635733952..1956593ee89d 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -609,11 +609,11 @@ static int hvcs_io(struct hvcs_struct *hvcsd)
609 /* remove the read masks */ 609 /* remove the read masks */
610 hvcsd->todo_mask &= ~(HVCS_READ_MASK); 610 hvcsd->todo_mask &= ~(HVCS_READ_MASK);
611 611
612 if (tty_buffer_request_room(tty, HVCS_BUFF_LEN) >= HVCS_BUFF_LEN) { 612 if (tty_buffer_request_room(&hvcsd->port, HVCS_BUFF_LEN) >= HVCS_BUFF_LEN) {
613 got = hvc_get_chars(unit_address, 613 got = hvc_get_chars(unit_address,
614 &buf[0], 614 &buf[0],
615 HVCS_BUFF_LEN); 615 HVCS_BUFF_LEN);
616 tty_insert_flip_string(tty, buf, got); 616 tty_insert_flip_string(&hvcsd->port, buf, got);
617 } 617 }
618 618
619 /* Give the TTY time to process the data we just sent. */ 619 /* Give the TTY time to process the data we just sent. */
@@ -623,7 +623,7 @@ static int hvcs_io(struct hvcs_struct *hvcsd)
623 spin_unlock_irqrestore(&hvcsd->lock, flags); 623 spin_unlock_irqrestore(&hvcsd->lock, flags);
624 /* This is synch because tty->low_latency == 1 */ 624 /* This is synch because tty->low_latency == 1 */
625 if(got) 625 if(got)
626 tty_flip_buffer_push(tty); 626 tty_flip_buffer_push(&hvcsd->port);
627 627
628 if (!got) { 628 if (!got) {
629 /* Do this _after_ the flip_buffer_push */ 629 /* Do this _after_ the flip_buffer_push */