ALSA: hda - Set patch_ops before calling auto-parser

[deliverable/linux.git] / sound / pci / hda / patch_cirrus.c

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 50e9dd67557973a0e07e8caded74d37bf78bb0d2..25ccf781fbe705cb5b2980814f7d4f90aff2d4a6 100644 (file)
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -584,6 +584,7 @@ static int patch_cs420x(struct hda_codec *codec)
        if (!spec)
                return -ENOMEM;
 
+       codec->patch_ops = cs_patch_ops;
        spec->gen.automute_hook = cs_automute;
        codec->single_adc_amp = 1;
 
@@ -595,8 +596,6 @@ static int patch_cs420x(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       codec->patch_ops = cs_patch_ops;
-
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
@@ -738,6 +737,7 @@ static int patch_cs4208(struct hda_codec *codec)
        if (!spec)
                return -ENOMEM;
 
+       codec->patch_ops = cs_patch_ops;
        spec->gen.automute_hook = cs_automute;
        /* exclude NID 0x10 (HP) from output volumes due to different steps */
        spec->gen.out_vol_mask = 1ULL << 0x10;
@@ -756,8 +756,6 @@ static int patch_cs4208(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       codec->patch_ops = cs_patch_ops;
-
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
@@ -1150,6 +1148,7 @@ static int patch_cs4210(struct hda_codec *codec)
        if (!spec)
                return -ENOMEM;
 
+       codec->patch_ops = cs421x_patch_ops;
        spec->gen.automute_hook = cs_automute;
 
        snd_hda_pick_fixup(codec, cs421x_models, cs421x_fixup_tbl,
@@ -1167,8 +1166,6 @@ static int patch_cs4210(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       codec->patch_ops = cs421x_patch_ops;
-
        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
@@ -1187,11 +1184,12 @@ static int patch_cs4213(struct hda_codec *codec)
        if (!spec)
                return -ENOMEM;
 
+       codec->patch_ops = cs421x_patch_ops;
+
        err = cs421x_parse_auto_config(codec);
        if (err < 0)
                goto error;
 
-       codec->patch_ops = cs421x_patch_ops;
        return 0;
 
  error: