diff --git a/[refs] b/[refs] index 7181af8c4494..e21868d62a43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33aeb9da1b5248c8ffce046be4e992ff5d97d529 +refs/heads/master: a1bf9584429d61b7096f93ae09325e1ba538e9e8 diff --git a/trunk/drivers/tty/tty_ioctl.c b/trunk/drivers/tty/tty_ioctl.c index 8481b29d5b3a..cc0fc52787c7 100644 --- a/trunk/drivers/tty/tty_ioctl.c +++ b/trunk/drivers/tty/tty_ioctl.c @@ -1096,12 +1096,16 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg) ld = tty_ldisc_ref_wait(tty); switch (arg) { case TCIFLUSH: - if (ld && ld->ops->flush_buffer) + if (ld && ld->ops->flush_buffer) { ld->ops->flush_buffer(tty); + tty_unthrottle(tty); + } break; case TCIOFLUSH: - if (ld && ld->ops->flush_buffer) + if (ld && ld->ops->flush_buffer) { ld->ops->flush_buffer(tty); + tty_unthrottle(tty); + } /* fall through */ case TCOFLUSH: tty_driver_flush_buffer(tty);