diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-02-10 04:44:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:25 -0500 |
commit | 174f13076717b8c7b70a18a474a0541a31d24527 (patch) | |
tree | c077d737f9d6bbb60c727c7c615f1cc8fb6b9f5a | |
parent | 02d3fca0927279d15299e8c2b9e9e42ab29cee7f (diff) |
[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>
-rw-r--r-- | drivers/char/isicom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 26d3f78bf8ed..c837ade1e80b 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) | |||
564 | port = card->ports + channel; | 564 | port = card->ports + channel; |
565 | if (!(port->flags & ASYNC_INITIALIZED)) { | 565 | if (!(port->flags & ASYNC_INITIALIZED)) { |
566 | outw(0x0000, base+0x04); /* enable interrupts */ | 566 | outw(0x0000, base+0x04); /* enable interrupts */ |
567 | spin_unlock(&card->card_lock); | ||
567 | return IRQ_HANDLED; | 568 | return IRQ_HANDLED; |
568 | } | 569 | } |
569 | 570 | ||
@@ -678,6 +679,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id) | |||
678 | tty_flip_buffer_push(tty); | 679 | tty_flip_buffer_push(tty); |
679 | } | 680 | } |
680 | outw(0x0000, base+0x04); /* enable interrupts */ | 681 | outw(0x0000, base+0x04); /* enable interrupts */ |
682 | spin_unlock(&card->card_lock); | ||
681 | 683 | ||
682 | return IRQ_HANDLED; | 684 | return IRQ_HANDLED; |
683 | } | 685 | } |