diff options
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 583356426dfb..45d8eb5de69f 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -503,20 +503,9 @@ static void* mgslpc_get_text_ptr(void) | |||
503 | * The wrappers maintain line discipline references | 503 | * The wrappers maintain line discipline references |
504 | * while calling into the line discipline. | 504 | * while calling into the line discipline. |
505 | * | 505 | * |
506 | * ldisc_flush_buffer - flush line discipline receive buffers | ||
507 | * ldisc_receive_buf - pass receive data to line discipline | 506 | * ldisc_receive_buf - pass receive data to line discipline |
508 | */ | 507 | */ |
509 | 508 | ||
510 | static void ldisc_flush_buffer(struct tty_struct *tty) | ||
511 | { | ||
512 | struct tty_ldisc *ld = tty_ldisc_ref(tty); | ||
513 | if (ld) { | ||
514 | if (ld->flush_buffer) | ||
515 | ld->flush_buffer(tty); | ||
516 | tty_ldisc_deref(ld); | ||
517 | } | ||
518 | } | ||
519 | |||
520 | static void ldisc_receive_buf(struct tty_struct *tty, | 509 | static void ldisc_receive_buf(struct tty_struct *tty, |
521 | const __u8 *data, char *flags, int count) | 510 | const __u8 *data, char *flags, int count) |
522 | { | 511 | { |
@@ -2467,10 +2456,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp) | |||
2467 | if (info->flags & ASYNC_INITIALIZED) | 2456 | if (info->flags & ASYNC_INITIALIZED) |
2468 | mgslpc_wait_until_sent(tty, info->timeout); | 2457 | mgslpc_wait_until_sent(tty, info->timeout); |
2469 | 2458 | ||
2470 | if (tty->driver->flush_buffer) | 2459 | mgslpc_flush_buffer(tty); |
2471 | tty->driver->flush_buffer(tty); | ||
2472 | 2460 | ||
2473 | ldisc_flush_buffer(tty); | 2461 | tty_ldisc_flush(tty); |
2474 | 2462 | ||
2475 | shutdown(info); | 2463 | shutdown(info); |
2476 | 2464 | ||