Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[uclinux-h8/linux.git] / sound / pci / hda / patch_conexant.c

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 78b719b..f788a91 100644 (file)
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -850,6 +850,7 @@ static int patch_conexant_auto(struct hda_codec *codec)
                return -ENOMEM;
        snd_hda_gen_spec_init(&spec->gen);
        codec->spec = spec;
+       codec->patch_ops = cx_auto_patch_ops;
 
        cx_auto_parse_beep(codec);
        cx_auto_parse_eapd(codec);
@@ -908,8 +909,6 @@ static int patch_conexant_auto(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       codec->patch_ops = cx_auto_patch_ops;
-
        /* Some laptops with Conexant chips show stalls in S3 resume,
         * which falls into the single-cmd mode.
         * Better to make reset, then.