Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: hda - Fix broken reconfig

The HD-audio reconfig function got broken in the recent kernels,
typically resulting in a failure like:
snd_hda_intel 0000:00:1b.0: control 3:0:0:Playback Channel Map:0 is already present

This is because of the code restructuring to move the PCM and control
instantiation into the codec drive probe, by the commit [bcd96557bd0a:
ALSA: hda - Build PCMs and controls at codec driver probe]. Although
the commit above removed the calls of snd_hda_codec_build_pcms() and
*_build_controls() at the controller driver probe, the similar calls
in the reconfig were still left forgotten. This caused the
conflicting and duplicated PCMs and controls.

The fix is trivial: just remove these superfluous calls from
reconfig_codec().

Fixes: bcd96557bd0a ('ALSA: hda - Build PCMs and controls at codec driver probe')
Reported-by: Jochen Henneberg <jh@henneberg-systemdesign.com>
Cc: <stable@vger.kernel.org> # v4.1+
Signed-off-by: Takashi Iwai <tiwai@suse.de>

-8
-8
sound/pci/hda/hda_sysfs.c
··· 141 141 err = snd_hda_codec_configure(codec); 142 142 if (err < 0) 143 143 goto error; 144 - /* rebuild PCMs */ 145 - err = snd_hda_codec_build_pcms(codec); 146 - if (err < 0) 147 - goto error; 148 - /* rebuild mixers */ 149 - err = snd_hda_codec_build_controls(codec); 150 - if (err < 0) 151 - goto error; 152 144 err = snd_card_register(codec->card); 153 145 error: 154 146 snd_hda_power_down(codec);