Merge branch 'fix/hda' into topic/hda

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 8fddc9d08726670c8d67dc1ce9f31dd1f82a56c4..f0af8cfab41096e60b13ba43fd497fd0168854e8 100644 (file)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1682,6 +1682,8 @@ struct alc_fixup {
        unsigned int sku;
        const struct alc_pincfg *pins;
        const struct hda_verb *verbs;
+       void (*func)(struct hda_codec *codec, const struct alc_fixup *fix,
+                    int pre_init);
 };
 
 static void alc_pick_fixup(struct hda_codec *codec,
@@ -1721,6 +1723,13 @@ static void alc_pick_fixup(struct hda_codec *codec,
 #endif
                add_verb(codec->spec, fix->verbs);
        }
+       if (fix->func) {
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+               snd_printdd(KERN_INFO "hda_codec: %s: Apply fix-func for %s\n",
+                           codec->chip_name, quirk->name);
+#endif
+               fix->func(codec, fix, pre_init);
+       }
 }
 
 static int alc_read_coef_idx(struct hda_codec *codec,