summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-08-18 03:02:26 -0700
committerTrent Piepho <xyzzy@speakeasy.org>2007-08-18 03:02:26 -0700
commitfc897dea33e8562dcab15ccb3f90f8f354b4cb7e (patch)
tree8543c1c18b2d003b02bfd0679abb38a5e8d9caa6 /linux
parent17436676851595daf49b90f156dc96e5748cb8ce (diff)
downloadmediapointer-dvb-s2-fc897dea33e8562dcab15ccb3f90f8f354b4cb7e.tar.gz
mediapointer-dvb-s2-fc897dea33e8562dcab15ccb3f90f8f354b4cb7e.tar.bz2
cx88-alsa: Call core irq handler when needed
From: Trent Piepho <xyzzy@speakeasy.org> 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>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/cx88/cx88-alsa.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index 872957a76..61dbac632 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -302,6 +302,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);