---

yaml --- r: 354787 b: refs/heads/master c: bd5d7ce h: refs/heads/master i: 354785: 89548c3 354783: a465441 v: v3
git-mirror · Jan 16, 2013 · 429efd5 · 429efd5
1 parent d52ec0f
commit 429efd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b342dd512f7af0e0e14e29c3e1f863150cfc46ff
+refs/heads/master: bd5d7ce9afdd0cddc5ab65e20d1134ccad824418
diff --git a/trunk/drivers/tty/tty_ldisc.c b/trunk/drivers/tty/tty_ldisc.c
@@ -64,7 +64,9 @@ static void put_ldisc(struct tty_ldisc *ld)
 		return;
 	}
 	raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-	wake_up(&ld->wq_idle);
+
+	if (waitqueue_active(&ld->wq_idle))
+		wake_up(&ld->wq_idle);
 }
 
 /**