summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authornshmyrev@yandex.ru <nshmyrev@yandex.ru>2005-11-08 21:37:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:19 -0800
commitc58c21c7a2ef7d1eb45231d5c1bb24d88a9666b8 (patch)
treecc95753e4ee03568799cab041f76b0222b765c1c /drivers
parentcf1c5d1d58793bb9320467226ffc850c75c20902 (diff)
downloadblackbird-op-linux-c58c21c7a2ef7d1eb45231d5c1bb24d88a9666b8.tar.gz
blackbird-op-linux-c58c21c7a2ef7d1eb45231d5c1bb24d88a9666b8.zip
[PATCH] v4l: 797: more intellect on clearing in bits on irq lock
- More intellect on clearing in bits on irq lock. Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/bttv-driver.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 504d717b1158..058b923b4b13 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -3736,10 +3736,22 @@ static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs)
count++;
if (count > 4) {
- btwrite(0, BT848_INT_MASK);
- printk(KERN_ERR
- "bttv%d: IRQ lockup, cleared int mask [", btv->c.nr);
+
+ if (count > 8 || !(astat & BT848_INT_GPINT)) {
+ btwrite(0, BT848_INT_MASK);
+
+ printk(KERN_ERR
+ "bttv%d: IRQ lockup, cleared int mask [", btv->c.nr);
+ } else {
+ printk(KERN_ERR
+ "bttv%d: IRQ lockup, clearing GPINT from int mask [", btv->c.nr);
+
+ btwrite(btread(BT848_INT_MASK) & (-1 ^ BT848_INT_GPINT),
+ BT848_INT_MASK);
+ };
+
bttv_print_irqbits(stat,astat);
+
printk("]\n");
}
}
OpenPOWER on IntegriCloud