ALSA: hda - Fix broken reconfig
commitda58c2eb0bdbfa02cd32d5c8e73ff21c7c49b601
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 May 2016 08:24:02 +0000 (10 10:24 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Tue, 17 May 2016 17:43:07 +0000 (17 13:43 -0400)
tree3730704521b05d73525fa2023eece70ab3c75dca
parent4a4c1df1af598459b550861f6bff17bfd8792295
ALSA: hda - Fix broken reconfig

[ Upstream commit addacd801e1638f41d659cb53b9b73fc14322cb1 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
sound/pci/hda/hda_sysfs.c