diff --git a/[refs] b/[refs] index 1401ab55d93b..a9a830df6073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43046b606673c9c991919ff75b980b72541e9ede +refs/heads/master: 514fc01d389cf5d364ee3b5fec4ac1487448803e diff --git a/trunk/drivers/char/tty_buffer.c b/trunk/drivers/char/tty_buffer.c index 0296612cc7df..66fa4e10d76b 100644 --- a/trunk/drivers/char/tty_buffer.c +++ b/trunk/drivers/char/tty_buffer.c @@ -468,7 +468,7 @@ static void flush_to_ldisc(struct work_struct *work) */ void tty_flush_to_ldisc(struct tty_struct *tty) { - flush_to_ldisc(&tty->buf.work.work); + flush_delayed_work(&tty->buf.work); } /**