Merge tag 'sound-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jun 2017 17:30:26 +0000 (10:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jun 2017 17:30:26 +0000 (10:30 -0700)
Pull sound fixes from Takashi Iwai:
 "Two last-minute HD-audio fixes"

* tag 'sound-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix endless loop of codec configure
  ALSA: hda - set input_path bitmap to zero after moving it to new place

sound/pci/hda/hda_codec.h
sound/pci/hda/hda_controller.c
sound/pci/hda/hda_generic.c

index d6fb2d5d01a70ef21eb533f1b86cb9c9c8f2be84..60ce1cfc300f9cb419acbc67425076c120829f13 100644 (file)
@@ -295,6 +295,8 @@ struct hda_codec {
 
 #define list_for_each_codec(c, bus) \
        list_for_each_entry(c, &(bus)->core.codec_list, core.list)
+#define list_for_each_codec_safe(c, n, bus)                            \
+       list_for_each_entry_safe(c, n, &(bus)->core.codec_list, core.list)
 
 /* snd_hda_codec_read/write optional flags */
 #define HDA_RW_NO_RESPONSE_FALLBACK    (1 << 0)
index 3715a5725613bd8b8bdbcafc79b380044cacb491..1c60beb5b70a63a0ab25a828392a3cb175a4da8b 100644 (file)
@@ -1337,8 +1337,12 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs);
 /* configure each codec instance */
 int azx_codec_configure(struct azx *chip)
 {
-       struct hda_codec *codec;
-       list_for_each_codec(codec, &chip->bus) {
+       struct hda_codec *codec, *next;
+
+       /* use _safe version here since snd_hda_codec_configure() deregisters
+        * the device upon error and deletes itself from the bus list.
+        */
+       list_for_each_codec_safe(codec, next, &chip->bus) {
                snd_hda_codec_configure(codec);
        }
        return 0;
index 2842c82363c0435f90edfe06793df254c36d43ef..71545b56b4c82bf3cca37e3d99474c8cad78971f 100644 (file)
@@ -3174,6 +3174,7 @@ static int check_dyn_adc_switch(struct hda_codec *codec)
                                                spec->input_paths[i][nums]);
                                        spec->input_paths[i][nums] =
                                                spec->input_paths[i][n];
+                                       spec->input_paths[i][n] = 0;
                                }
                        }
                        nums++;