]> git.karo-electronics.de Git - linux-beck.git/commitdiff
TTY: ipwireless, use synchronous hangup
authorJiri Slaby <jslaby@suse.cz>
Mon, 2 Apr 2012 11:54:31 +0000 (13:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Apr 2012 18:30:39 +0000 (11:30 -0700)
Do not touch internal workqueue. Call tty_vhangup instead.

Note that finished hangup does not necessarily mean that all processes
are dead. Especially when the tty is a console. The code assumes that
right now.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/ipwireless/tty.c

index 4daf962f70557c637bda448b346ffc52ec4bac46..e5396212e2230073c0585310f9ae7614116d22ba 100644 (file)
@@ -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)