[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>
This commit is contained in:
nshmyrev@yandex.ru 2005-11-08 21:37:41 -08:00 committed by Linus Torvalds
parent cf1c5d1d58
commit c58c21c7a2

View File

@ -3736,10 +3736,22 @@ static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs)
count++; count++;
if (count > 4) { if (count > 4) {
if (count > 8 || !(astat & BT848_INT_GPINT)) {
btwrite(0, BT848_INT_MASK); btwrite(0, BT848_INT_MASK);
printk(KERN_ERR printk(KERN_ERR
"bttv%d: IRQ lockup, cleared int mask [", btv->c.nr); "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); bttv_print_irqbits(stat,astat);
printk("]\n"); printk("]\n");
} }
} }