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

ALSA: emu10k1: simplify freeing synth voices 



snd_emu10k1_voice_free() resets the hardware itself, so doing that
in the calling function as well is redundant.

Signed-off-by: default avatarOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230518140947.3725394-2-oswald.buddenhagen@gmx.de


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

sound/pci/emu10k1/emu10k1_callback.c

+0 −5
Original line number Diff line number Diff line
@@ -165,11 +165,6 @@ free_voice(struct snd_emux_voice *vp) 
	/* Problem apparent on plug, unplug then plug */

	/* on the Audigy 2 ZS Notebook. */

	if (hw && (vp->ch >= 0)) {

		snd_emu10k1_ptr_write(hw, IFATN, vp->ch, 0xff00);

		snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);

		// snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0);

		snd_emu10k1_ptr_write(hw, VTFT, vp->ch, 0xffff);

		snd_emu10k1_ptr_write(hw, CVCF, vp->ch, 0xffff);

		snd_emu10k1_voice_free(hw, &hw->voices[vp->ch]);

		vp->emu->num_voices--;

		vp->ch = -1;