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

Commit c21c8cf7 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: hda - Add fixup_forced flag 



The "fixup_forced" flag will indicate whether a specific fixup
(or nofixup) has been set by the user, to override the driver's
default.
This flag will help future patches.

Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a860d95f

sound/pci/hda/hda_auto_parser.c

+6 −3
Original line number Diff line number Diff line
@@ -852,15 +852,17 @@ void snd_hda_pick_fixup(struct hda_codec *codec, 
	if (codec->modelname && !strcmp(codec->modelname, "nofixup")) {

		codec->fixup_list = NULL;

		codec->fixup_id = -1;

		codec->fixup_forced = 1;

		return;

	}



	if (codec->modelname && models) {

		while (models->name) {

			if (!strcmp(codec->modelname, models->name)) {

				id = models->id;

				name = models->name;

				break;

				codec->fixup_id = models->id;

				codec->fixup_name = models->name;

				codec->fixup_forced = 1;

				return;

			}

			models++;

		}
@@ -889,6 +891,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec, 
		}

	}



	codec->fixup_forced = 0;

	codec->fixup_id = id;

	if (id >= 0) {

		codec->fixup_list = fixlist;

sound/pci/hda/hda_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ struct hda_codec { 


	/* fix-up list */

	int fixup_id;

	unsigned int fixup_forced:1; /* fixup explicitly set by user */

	const struct hda_fixup *fixup_list;

	const char *fixup_name;