Merge the right tty-fixes branch

* branch 'tty-fixes'
  tty: use the new 'flush_delayed_work()' helper to do ldisc flush
  workqueue: add 'flush_delayed_work()' to run and wait for delayed work
  tty: Make flush_to_ldisc() locking more robust

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ccefe574dcf7..47cdd7e76f2b 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -647,7 +647,7 @@ EXPORT_SYMBOL(schedule_delayed_work);
  */
 void flush_delayed_work(struct delayed_work *dwork)
 {
-        if (del_timer(&dwork->timer)) {
+        if (del_timer_sync(&dwork->timer)) {
                 struct cpu_workqueue_struct *cwq;
                 cwq = wq_per_cpu(keventd_wq, get_cpu());
                 __queue_work(cwq, &dwork->work);