aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/isicom.c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-02-10 04:44:53 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 13:51:26 -0500
commitcb4a10ccb0c5b5b02dec1a4a97cba1e8b2c2a325 (patch)
tree5abb7c542e810632c36cd820ec2acc1b7a10d12a /drivers/char/isicom.c
parentf0a0ba6d69882ae14f24d7eb6e2ae07f30fbd56a (diff)
[PATCH] Char: isicom, check card state in isr
Check if the card really interrupted us by reading its IO space and eventualy return IRQ_NONE. 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/isicom.c')
-rw-r--r--drivers/char/isicom.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 42171ad001dd..eddb8d3a620e 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -540,6 +540,11 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
540 return IRQ_NONE; 540 return IRQ_NONE;
541 541
542 base = card->base; 542 base = card->base;
543
544 /* did the card interrupt us? */
545 if (!(inw(base + 0x0e) & 0x02))
546 return IRQ_NONE;
547
543 spin_lock(&card->card_lock); 548 spin_lock(&card->card_lock);
544 549
545 /* 550 /*