projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02d3fca
)
[PATCH] Char: isicom, fix locking in isr
author
Jiri Slaby
<
[email protected]
>
Sat, 10 Feb 2007 09:44:52 +0000
(
01:44
-0800)
committer
Linus Torvalds
<
[email protected]
>
Sun, 11 Feb 2007 18:51:25 +0000
(10:51 -0800)
2 spin_unlocks are omitted in the interrupt handler. Put them there to fix up
deadlocking on UP.
Signed-off-by: Jiri Slaby <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/char/isicom.c
patch
|
blob
|
history
diff --git
a/drivers/char/isicom.c
b/drivers/char/isicom.c
index 26d3f78bf8edccc463e6aad6d39f5b2261f561b2..c837ade1e80b38f98318b5bcfb664a23354e7ea0 100644
(file)
--- 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;
}