Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4adc6b93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

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
parents 86c3e00a d94815f9

sound/pci/hda/hda_codec.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

sound/pci/hda/hda_controller.c

+6 −2
Original line number Diff line number Diff line
@@ -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;

sound/pci/hda/hda_generic.c

+1 −0
Original line number Diff line number Diff line
@@ -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++;