Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / char / pcmcia / ipwireless / tty.c

diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
index 1a2c2c3b068f08401ead84b00d1e6a63c6ff0728..f5eb28b6cb0f53da42c256d1f92f3832d9405af7 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ b/drivers/char/pcmcia/ipwireless/tty.c
@@ -577,7 +577,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
                                mutex_unlock(&ttyj->ipw_tty_mutex);
                                tty_hangup(ttyj->linux_tty);
                                /* Wait till the tty_hangup has completed */
-                               flush_scheduled_work();
+                               flush_work_sync(&ttyj->linux_tty->hangup_work);
                                /* FIXME: Exactly how is the tty object locked here
                                   against a parallel ioctl etc */
                                mutex_lock(&ttyj->ipw_tty_mutex);