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

Commit f62faedb authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Set mixer name after codec patch 



Postpone the mixer name setup after the codec patch since the codec
patch may change the codec name string in itself.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9dc8398b

sound/pci/hda/hda_codec.c

+5 −5
Original line number Diff line number Diff line
@@ -1086,11 +1086,6 @@ int snd_hda_codec_configure(struct hda_codec *codec) 
		if (err < 0)

			return err;

	}

	/* audio codec should override the mixer name */

	if (codec->afg || !*codec->bus->card->mixername)

		snprintf(codec->bus->card->mixername,

			 sizeof(codec->bus->card->mixername),

			 "%s %s", codec->vendor_name, codec->chip_name);



	if (is_generic_config(codec)) {

		err = snd_hda_parse_generic_codec(codec);
@@ -1109,6 +1104,11 @@ int snd_hda_codec_configure(struct hda_codec *codec) 
 patched:

	if (!err && codec->patch_ops.unsol_event)

		err = init_unsol_queue(codec->bus);

	/* audio codec should override the mixer name */

	if (!err && (codec->afg || !*codec->bus->card->mixername))

		snprintf(codec->bus->card->mixername,

			 sizeof(codec->bus->card->mixername),

			 "%s %s", codec->vendor_name, codec->chip_name);

	return err;

}

EXPORT_SYMBOL_HDA(snd_hda_codec_configure);