summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-02-10 01:44:52 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:25 -0800
commit174f13076717b8c7b70a18a474a0541a31d24527 (patch)
treec077d737f9d6bbb60c727c7c615f1cc8fb6b9f5a /drivers/char
parent02d3fca0927279d15299e8c2b9e9e42ab29cee7f (diff)
downloadop-kernel-dev-174f13076717b8c7b70a18a474a0541a31d24527.zip
op-kernel-dev-174f13076717b8c7b70a18a474a0541a31d24527.tar.gz
[PATCH] Char: isicom, fix locking in isr
2 spin_unlocks are omitted in the interrupt handler. Put them there to fix up deadlocking on UP. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/isicom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 26d3f78..c837ade 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -564,6 +564,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
port = card->ports + channel;
if (!(port->flags & ASYNC_INITIALIZED)) {
outw(0x0000, base+0x04); /* enable interrupts */
+ spin_unlock(&card->card_lock);
return IRQ_HANDLED;
}
@@ -678,6 +679,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
tty_flip_buffer_push(tty);
}
outw(0x0000, base+0x04); /* enable interrupts */
+ spin_unlock(&card->card_lock);
return IRQ_HANDLED;
}
OpenPOWER on IntegriCloud