ALSA: hda - Fix broken reconfig
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 May 2016 08:24:02 +0000 (10:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 10 May 2016 08:30:13 +0000 (10:30 +0200)
commitaddacd801e1638f41d659cb53b9b73fc14322cb1
treeb32244e256cfee9a5a62740ba393d1d95e0ca978
parent2da2dc9ead232f25601404335cca13c0f722d41b
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>
sound/pci/hda/hda_sysfs.c