Commit 583307ba authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Takashi Iwai
Browse files

ALSA: emu10k1: simplify interrupt handler, part 1 



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: default avatarOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230518093047.3697887-1-oswald.buddenhagen@gmx.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0be0a62f

sound/pci/emu10k1/irq.c

+1 −2
Original line number Diff line number Diff line
@@ -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);