diff options
| author | Jan Yenya Kasprzak <kas@fi.muni.cz> | 2007-04-23 14:41:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 08:23:07 -0700 |
| commit | 67d2bc58afdd5168dce54ae06f5f30038c59f498 (patch) | |
| tree | 0036ede42ee23a9c2092dcab2ffad10fff6a5014 | |
| parent | 3d124cbba316737af8f3a6959edb95bbd130a4d8 (diff) | |
| download | linux-3.10-67d2bc58afdd5168dce54ae06f5f30038c59f498.tar.gz linux-3.10-67d2bc58afdd5168dce54ae06f5f30038c59f498.tar.bz2 linux-3.10-67d2bc58afdd5168dce54ae06f5f30038c59f498.zip | |
Char: mxser_new, fix recursive locking
Signed-off-by: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/char/mxser_new.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index 9af07e4999d..59e0aac19c2 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c @@ -2230,7 +2230,14 @@ end_intr: port->mon_data.rxcnt += cnt; port->mon_data.up_rxcnt += cnt; + /* + * We are called from an interrupt context with &port->slock + * being held. Drop it temporarily in order to prevent + * recursive locking. + */ + spin_unlock(&port->slock); tty_flip_buffer_push(tty); + spin_lock(&port->slock); } static void mxser_transmit_chars(struct mxser_port *port) |