diff options
Diffstat (limited to 'drivers/s390/char/con3215.c')
-rw-r--r-- | drivers/s390/char/con3215.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 4b632504c65c..d3ec9b55ab35 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c | |||
@@ -373,7 +373,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
373 | struct raw3215_req *req; | 373 | struct raw3215_req *req; |
374 | struct tty_struct *tty; | 374 | struct tty_struct *tty; |
375 | int cstat, dstat; | 375 | int cstat, dstat; |
376 | int count, slen; | 376 | int count; |
377 | 377 | ||
378 | raw = cdev->dev.driver_data; | 378 | raw = cdev->dev.driver_data; |
379 | req = (struct raw3215_req *) intparm; | 379 | req = (struct raw3215_req *) intparm; |
@@ -390,8 +390,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
390 | break; | 390 | break; |
391 | /* Attention interrupt, someone hit the enter key */ | 391 | /* Attention interrupt, someone hit the enter key */ |
392 | raw3215_mk_read_req(raw); | 392 | raw3215_mk_read_req(raw); |
393 | if (MACHINE_IS_P390) | ||
394 | memset(raw->inbuf, 0, RAW3215_INBUF_SIZE); | ||
395 | tasklet_schedule(&raw->tasklet); | 393 | tasklet_schedule(&raw->tasklet); |
396 | break; | 394 | break; |
397 | case 0x08: | 395 | case 0x08: |
@@ -414,11 +412,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
414 | 412 | ||
415 | tty = raw->tty; | 413 | tty = raw->tty; |
416 | count = 160 - req->residual; | 414 | count = 160 - req->residual; |
417 | if (MACHINE_IS_P390) { | ||
418 | slen = strnlen(raw->inbuf, RAW3215_INBUF_SIZE); | ||
419 | if (count > slen) | ||
420 | count = slen; | ||
421 | } else | ||
422 | EBCASC(raw->inbuf, count); | 415 | EBCASC(raw->inbuf, count); |
423 | cchar = ctrlchar_handle(raw->inbuf, count, tty); | 416 | cchar = ctrlchar_handle(raw->inbuf, count, tty); |
424 | switch (cchar & CTRLCHAR_MASK) { | 417 | switch (cchar & CTRLCHAR_MASK) { |