| Message ID | 20230518093047.3697887-1-oswald.buddenhagen@gmx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] ALSA: emu10k1: simplify interrupt handler, part 1 | expand |
On Thu, 18 May 2023 11:30:44 +0200, Oswald Buddenhagen wrote: > > IPR_CHANNELNUMBERMASK cannot be non-zero when IPR_CHANNELLOOP is unset, > so join marking them as handled. > This logically reverts part of commit f453e20d8a0 ("ALSA update > 0.9.3a"), which made the inverse change with no explanation. > > Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Applied all four patches now. Thanks. Takashi
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c index dfb44e5e69a7..0cb89bd8c16b 100644 --- a/sound/pci/emu10k1/irq.c +++ b/sound/pci/emu10k1/irq.c @@ -79,9 +79,8 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id) val >>= 1; pvoice++; } - status &= ~IPR_CHANNELLOOP; + status &= ~(IPR_CHANNELLOOP | IPR_CHANNELNUMBERMASK); } - status &= ~IPR_CHANNELNUMBERMASK; if (status & (IPR_ADCBUFFULL|IPR_ADCBUFHALFFULL)) { if (emu->capture_interrupt) emu->capture_interrupt(emu, status);
IPR_CHANNELNUMBERMASK cannot be non-zero when IPR_CHANNELLOOP is unset, so join marking them as handled. This logically reverts part of commit f453e20d8a0 ("ALSA update 0.9.3a"), which made the inverse change with no explanation. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> --- sound/pci/emu10k1/irq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)