summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_conexant.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-10 18:09:45 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-10 18:09:45 +0100
commit8a02c0cc4a5915e01bf19ef030166567713d0eb7 (patch)
tree49dadb7b6722e84962c079542acae0a877e4c486 /sound/pci/hda/patch_conexant.c
parent8eeaa2f9e06dcfb45593a0fcd91e81abc7f5d209 (diff)
downloadtalos-op-linux-8a02c0cc4a5915e01bf19ef030166567713d0eb7.tar.gz
talos-op-linux-8a02c0cc4a5915e01bf19ef030166567713d0eb7.zip
ALSA: hda - Move HDA_FIXUP_ACT_FREE call in snd_hda_gen_free()
Now Realtek and Conexant codec parsers just call snd_hda_gen_free(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r--sound/pci/hda/patch_conexant.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 6cc646531ce8..47861474fd87 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -2798,11 +2798,7 @@ static int cx_auto_init(struct hda_codec *codec)
return 0;
}
-static void cx_auto_free(struct hda_codec *codec)
-{
- snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_FREE);
- snd_hda_gen_free(codec);
-}
+#define cx_auto_free snd_hda_gen_free
static const struct hda_codec_ops cx_auto_patch_ops = {
.build_controls = cx_auto_build_controls,
OpenPOWER on IntegriCloud