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_ca0110.c

diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c
index 4473026..484bbf4 100644 (file)
--- a/sound/pci/hda/patch_ca0110.c
+++ b/sound/pci/hda/patch_ca0110.c
@@ -63,6 +63,7 @@ static int patch_ca0110(struct hda_codec *codec)
                return -ENOMEM;
        snd_hda_gen_spec_init(spec);
        codec->spec = spec;
+       codec->patch_ops = ca0110_patch_ops;
 
        spec->multi_cap_vol = 1;
        codec->bus->needs_damn_long_delay = 1;
@@ -71,8 +72,6 @@ static int patch_ca0110(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       codec->patch_ops = ca0110_patch_ops;
-
        return 0;
 
  error: