Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354820
b: refs/heads/master
c: a1bf958
h: refs/heads/master
v: v3
  • Loading branch information
Ilya Zykov authored and Greg Kroah-Hartman committed Jan 19, 2013
1 parent 80d350b commit 932dcb1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 33aeb9da1b5248c8ffce046be4e992ff5d97d529
refs/heads/master: a1bf9584429d61b7096f93ae09325e1ba538e9e8
8 changes: 6 additions & 2 deletions trunk/drivers/tty/tty_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 932dcb1

Please sign in to comment.