From e15c455792c6f35ef2d75741ddf8dc3959375dd3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 26 Jun 2012 15:00:20 +0200 Subject: [PATCH] --- yaml --- r: 311331 b: refs/heads/master c: 59cad16bc6deb85bd2a464da92bbaae289f0286f h: refs/heads/master i: 311329: 0c6d93699303b33c71ede03b3663e3bcfe238f0d 311327: 03710692e851753fb95baa6fc8f418e88fa35320 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bc168fa728cc..ce921ccb41a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee48df57c920ab876dd8cf0dcfe5b8893b98e934 +refs/heads/master: 59cad16bc6deb85bd2a464da92bbaae289f0286f diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 7504e62188d6..854dd0c25f89 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -1184,6 +1184,7 @@ static void snd_hda_codec_free(struct hda_codec *codec) { if (!codec) return; + snd_hda_jack_tbl_clear(codec); restore_init_pincfgs(codec); #ifdef CONFIG_SND_HDA_POWER_SAVE cancel_delayed_work(&codec->power_work); @@ -1192,6 +1193,7 @@ static void snd_hda_codec_free(struct hda_codec *codec) list_del(&codec->list); snd_array_free(&codec->mixers); snd_array_free(&codec->nids); + snd_array_free(&codec->cvt_setups); snd_array_free(&codec->conn_lists); snd_array_free(&codec->spdif_out); codec->bus->caddr_tbl[codec->addr] = NULL;