diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-15 17:02:48 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-15 17:02:48 +0000 |
| commit | 6da62ea55f07b925af39794448bc1082abf118b5 (patch) | |
| tree | 6a6d67891a5066a033c93d7da3ef4123513c44f5 /linux/drivers/media/video | |
| parent | 75bdff379e679479f11fb8c2332ee920b7f23eb9 (diff) | |
| download | mediapointer-dvb-s2-6da62ea55f07b925af39794448bc1082abf118b5.tar.gz mediapointer-dvb-s2-6da62ea55f07b925af39794448bc1082abf118b5.tar.bz2 | |
* ../linux/drivers/media/video/bttv-driver.c: (bttv_irq):
More intellect on clearing in bits on irq lock.
Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index fc3cfe53b..839e69dc9 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.61 2005/10/09 18:07:06 mchehab Exp $ + $Id: bttv-driver.c,v 1.62 2005/10/15 17:02:48 nsh Exp $ bttv - Bt848 frame grabber driver @@ -3764,10 +3764,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"); } } |