summaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>2023-05-18 16:09:41 +0200
committerTakashi Iwai <tiwai@suse.de>2023-05-18 16:49:07 +0200
commitf26a4cf087cbfc9dc71bb3812e8e11ccac0d4d61 (patch)
treeba3c921845670a924b4ec0d899849f6fd08b4939 /sound/pci/emu10k1
parentfccd6f31a450d58109f64eda2dd9294e160fb0aa (diff)
downloadlinux-stable-f26a4cf087cbfc9dc71bb3812e8e11ccac0d4d61.tar.gz
linux-stable-f26a4cf087cbfc9dc71bb3812e8e11ccac0d4d61.tar.bz2
linux-stable-f26a4cf087cbfc9dc71bb3812e8e11ccac0d4d61.zip
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: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Link: https://lore.kernel.org/r/20230518140947.3725394-2-oswald.buddenhagen@gmx.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r--sound/pci/emu10k1/emu10k1_callback.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index dcd7be2d281b..6686ca8ce5fc 100644
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -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;