ALSA: emu10k1: don't create old pass-through playback device on Audigy
PATCH 1/1 ALSA: emu10k1: don't create old pass-through playback device on Audigy
It could have never worked, as snd_emu10k1_fx8010_playback_prepare() and snd_emu10k1_fx8010_playback_hw_free() assume the emu10k1 offset for the ETRAM, and the default DSP code includes no handler for it. It also wouldn't make a lot of sense to make it work, as Audigy has an own, much simpler, pass-through mechanism. So just skip creation of the device.
--- sound/pci/emu10k1/emupcm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/pci/emu10k1/emupcm.c +7 -3
@@ -1781,17 +1781,21 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device)struct snd_kcontrol *kctl;int err; - err =snd_pcm_new (emu->card,"emu10k1 efx" , device,8 ,1 , &pcm); + err =snd_pcm_new (emu->card,"emu10k1 efx" , device, emu->audigy ?0 :8 ,1 , &pcm);if (err <0 )return err; pcm->private_data = emu; -snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_emu10k1_fx8010_playback_ops); +if (!emu->audigy) +snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_emu10k1_fx8010_playback_ops);snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_CAPTURE , &snd_emu10k1_capture_efx_ops); pcm->info_flags =0 ; -strcpy (pcm->name,"Multichannel Capture/PT Playback" ); +if (emu->audigy) +strcpy (pcm->name,"Multichannel Capture" ); +else +strcpy (pcm->name,"Multichannel Capture/PT Playback" ); emu->pcm_efx = pcm;/* EFX capture - record the "FXBUS2" channels, by default we connect the EXTINs
Signature · 1 line
2.40.0.152.g15d061e6df
Takashi Iwai
AppliedQuoted 8 lines · Oswald Buddenhagen
It could have never worked, as
snd_emu10k1_fx8010_playback_prepare()andsnd_emu10k1_fx8010_playback_hw_free()assume the emu10k1 offset for the ETRAM, and the default DSP code includes no handler for it. It also wouldn't make a lot of sense to make it work, as Audigy has an own, much simpler, pass-through mechanism. So just skip creation of the device.Signed-off-by Oswald Buddenhagen <[email protected]>
Applied, thanks.
Takashi