diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-03 15:23:14 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-03 15:23:14 -0200 |
| commit | 3dcb7f860446e00fa66038331d0c68662f726a7a (patch) | |
| tree | e44e88d4571b0ee7d1bf29fca60251ba007f4535 /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | 81c351c02f6ad4d967f24dc5f132fc6f5a755570 (diff) | |
| parent | 89200e6a6d61a33ac655f8992e95304c2995924d (diff) | |
| download | mediapointer-dvb-s2-3dcb7f860446e00fa66038331d0c68662f726a7a.tar.gz mediapointer-dvb-s2-3dcb7f860446e00fa66038331d0c68662f726a7a.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index adc194c22..639f5851b 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -659,21 +659,22 @@ static irqreturn_t saa7134_irq(int irq, void *dev_id) for (loop = 0; loop < 10; loop++) { report = saa_readl(SAA7134_IRQ_REPORT); status = saa_readl(SAA7134_IRQ_STATUS); - if (0 == report) { - if (irq_debug > 1) - printk(KERN_DEBUG "%s/irq: no (more) work\n", - dev->name); - goto out; - } - - /* If dmasound support is active and we get a sound report, exit - and let the saa7134-alsa/oss module deal with it */ + /* If dmasound support is active and we get a sound report, + * mask out the report and let the saa7134-alsa module deal + * with it */ if ((report & SAA7134_IRQ_REPORT_DONE_RA3) && (dev->dmasound.priv_data != NULL) ) { if (irq_debug > 1) - printk(KERN_DEBUG "%s/irq: ignoring interrupt for DMA sound\n", + printk(KERN_DEBUG "%s/irq: preserving DMA sound interrupt\n", + dev->name); + report &= ~SAA7134_IRQ_REPORT_DONE_RA3; + } + + if (0 == report) { + if (irq_debug > 1) + printk(KERN_DEBUG "%s/irq: no (more) work\n", dev->name); goto out; } |