summary refs log tree commit diff
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-08-18 07:02:26 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:05:55 -0300
commit5ba862b77e2d7f9e6e2cb133c43be32ac612aea5 (patch)
tree26b95709abf4d176a33d0f5409b1145e76f9c729
parent8ddac9ee4b6f08d7cacf79202ab882eefc55b0c0 (diff)
downloadlinux-5ba862b77e2d7f9e6e2cb133c43be32ac612aea5.tar.gz
V4L/DVB (6065): cx88-alsa: Call core irq handler when needed
When an irq handled by the cx88 core driver (currently IR and errors) occurs
and the cx88-alsa irq handler is the first called, it will claim to have
handled the irq but it doesn't call cx88_core_irq() to handle it.

The means loading cx88-alsa can disable the IR remote.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cx88/cx88-alsa.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index a529c0a87d1a..76a8c01208c1 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -285,6 +285,8 @@ static irqreturn_t cx8801_irq(int irq, void *dev_id)
 		handled = 1;
 		cx_write(MO_PCI_INTSTAT, status);
 
+		if (status & core->pci_irqmask)
+			cx88_core_irq(core, status);
 		if (status & PCI_INT_AUDINT) {
 			dprintk( 2, "    ALSA IRQ handling\n" );
 			cx8801_aud_irq(chip);