projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
pci
/
solo6x10
/
solo6x10-core.c
diff --git
a/drivers/media/pci/solo6x10/solo6x10-core.c
b/drivers/media/pci/solo6x10/solo6x10-core.c
index 172583d736fef31c30ab7338405e3d221d17211b..8cbe6b49f4c238de365b0a231eef8f4dff2425ff 100644
(file)
--- a/
drivers/media/pci/solo6x10/solo6x10-core.c
+++ b/
drivers/media/pci/solo6x10/solo6x10-core.c
@@
-105,11
+105,8
@@
static irqreturn_t solo_isr(int irq, void *data)
if (!status)
return IRQ_NONE;
if (!status)
return IRQ_NONE;
- if (status & ~solo_dev->irq_mask) {
- solo_reg_write(solo_dev, SOLO_IRQ_STAT,
- status & ~solo_dev->irq_mask);
- status &= solo_dev->irq_mask;
- }
+ /* Acknowledge all interrupts immediately */
+ solo_reg_write(solo_dev, SOLO_IRQ_STAT, status);
if (status & SOLO_IRQ_PCI_ERR)
solo_p2m_error_isr(solo_dev);
if (status & SOLO_IRQ_PCI_ERR)
solo_p2m_error_isr(solo_dev);
@@
-132,9
+129,6
@@
static irqreturn_t solo_isr(int irq, void *data)
if (status & SOLO_IRQ_G723)
solo_g723_isr(solo_dev);
if (status & SOLO_IRQ_G723)
solo_g723_isr(solo_dev);
- /* Clear all interrupts handled */
- solo_reg_write(solo_dev, SOLO_IRQ_STAT, status);
-
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}