git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
drivers
/
char
/
pcmcia
/
ipwireless
/
tty.c
diff --git
a/drivers/char/pcmcia/ipwireless/tty.c
b/drivers/char/pcmcia/ipwireless/tty.c
index
1a2c2c3
..
f5eb28b
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 */
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);
/* FIXME: Exactly how is the tty object locked here
against a parallel ioctl etc */
mutex_lock(&ttyj->ipw_tty_mutex);