aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-12-18 12:12:44 -0500
committerTakashi Iwai <tiwai@suse.de>2013-01-12 02:30:45 -0500
commitc9ce6b260b039392b24ad65954788047d13d4c9a (patch)
tree58a35568c53b2b291061d4b22430b0f64eb0f1b9 /sound/pci/hda/hda_codec.c
parent81fede89eda16a597c2d814113b74677754b0058 (diff)
ALSA: hda - Move fixup code into struct hda_codec
Since the fixup code is used commonly, it's worth to move it to the common place, struct hda_codec, instead of keeping in hda_gen_spec. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 0037147dcd54..e7749dee7c40 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1253,6 +1253,7 @@ int snd_hda_codec_new(struct hda_bus *bus,
1253 snd_array_init(&codec->conn_lists, sizeof(hda_nid_t), 64); 1253 snd_array_init(&codec->conn_lists, sizeof(hda_nid_t), 64);
1254 snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16); 1254 snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16);
1255 snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16); 1255 snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16);
1256 snd_array_init(&codec->verbs, sizeof(struct hda_verb *), 8);
1256 INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work); 1257 INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
1257 1258
1258#ifdef CONFIG_PM 1259#ifdef CONFIG_PM
@@ -2407,6 +2408,7 @@ int snd_hda_codec_reset(struct hda_codec *codec)
2407 snd_array_free(&codec->driver_pins); 2408 snd_array_free(&codec->driver_pins);
2408 snd_array_free(&codec->cvt_setups); 2409 snd_array_free(&codec->cvt_setups);
2409 snd_array_free(&codec->spdif_out); 2410 snd_array_free(&codec->spdif_out);
2411 snd_array_free(&codec->verbs);
2410 codec->num_pcms = 0; 2412 codec->num_pcms = 0;
2411 codec->pcm_info = NULL; 2413 codec->pcm_info = NULL;
2412 codec->preset = NULL; 2414 codec->preset = NULL;