From ec6b32a526156f6a7c0a749c545465853e5e15b0 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 2 Apr 2012 13:54:31 +0200 Subject: [PATCH] --- yaml --- r: 304160 b: refs/heads/master c: de3a60a3436ebfd780ced830cd09880ea9c45957 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/ipwireless/tty.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 374f50a39997..cda980e7eb6f 100644 --- 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 index 4daf962f7055..e5396212e223 100644 --- 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)