aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char/con3215.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/char/con3215.c')
-rw-r--r--drivers/s390/char/con3215.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 33b7141a182f..7b00fa634d40 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -412,8 +412,9 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
412 break; 412 break;
413 413
414 case CTRLCHAR_CTRL: 414 case CTRLCHAR_CTRL:
415 tty_insert_flip_char(tty, cchar, TTY_NORMAL); 415 tty_insert_flip_char(&raw->port, cchar,
416 tty_flip_buffer_push(tty); 416 TTY_NORMAL);
417 tty_flip_buffer_push(&raw->port);
417 break; 418 break;
418 419
419 case CTRLCHAR_NONE: 420 case CTRLCHAR_NONE:
@@ -425,8 +426,9 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
425 count++; 426 count++;
426 } else 427 } else
427 count -= 2; 428 count -= 2;
428 tty_insert_flip_string(tty, raw->inbuf, count); 429 tty_insert_flip_string(&raw->port, raw->inbuf,
429 tty_flip_buffer_push(tty); 430 count);
431 tty_flip_buffer_push(&raw->port);
430 break; 432 break;
431 } 433 }
432 } else if (req->type == RAW3215_WRITE) { 434 } else if (req->type == RAW3215_WRITE) {
@@ -970,7 +972,7 @@ static int tty3215_open(struct tty_struct *tty, struct file * filp)
970 972
971 tty_port_tty_set(&raw->port, tty); 973 tty_port_tty_set(&raw->port, tty);
972 974
973 tty->low_latency = 0; /* don't use bottom half for pushing chars */ 975 raw->port.low_latency = 0; /* don't use bottom half for pushing chars */
974 /* 976 /*
975 * Start up 3215 device 977 * Start up 3215 device
976 */ 978 */