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: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

2 files changed, 7 insertions, 3 deletions

diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 90d2fda6c8f9..36961ab3b81d 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -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;
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index a4233136cb93..5825aa17d8e3 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -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;