---

yaml --- r: 304160 b: refs/heads/master c: de3a60a h: refs/heads/master v: v3
git-mirror · Apr 9, 2012 · ec6b32a · ec6b32a
1 parent dcbcfb0
commit ec6b32a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daea440215ae86bf9fdfe82420710ae749eb73c7
+refs/heads/master: de3a60a3436ebfd780ced830cd09880ea9c45957
diff --git a/trunk/drivers/tty/ipwireless/tty.c b/trunk/drivers/tty/ipwireless/tty.c
@@ -565,11 +565,11 @@ void ipwireless_tty_free(struct ipw_tty *tty)
 			ttyj->closing = 1;
 			if (ttyj->linux_tty != NULL) {
 				mutex_unlock(&ttyj->ipw_tty_mutex);
-				tty_hangup(ttyj->linux_tty);
-				/* Wait till the tty_hangup has completed */
-				flush_work_sync(&ttyj->linux_tty->hangup_work);
+				tty_vhangup(ttyj->linux_tty);
 				/* FIXME: Exactly how is the tty object locked here
 				   against a parallel ioctl etc */
+				/* FIXME2: hangup does not mean all processes
+				 * are gone */
 				mutex_lock(&ttyj->ipw_tty_mutex);
 			}
 			while (ttyj->open_count)