projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fccd6f3
)
ALSA: emu10k1: simplify freeing synth voices
author
Oswald Buddenhagen
<oswald.buddenhagen@gmx.de>
Thu, 18 May 2023 14:09:41 +0000
(16:09 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 18 May 2023 14:49:07 +0000
(16:49 +0200)
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>
sound/pci/emu10k1/emu10k1_callback.c
patch
|
blob
|
history
diff --git
a/sound/pci/emu10k1/emu10k1_callback.c
b/sound/pci/emu10k1/emu10k1_callback.c
index
dcd7be2
..
6686ca8
100644
(file)
--- 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;