diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-27 08:36:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-27 08:36:48 +0100 |
| commit | 42dc2378b52bb6e155dd2e4fb4ca694785bf2c1d (patch) | |
| tree | cba90396b1c91c923758b47d55ad0f1d50100168 /sound/pci/hda/patch_conexant.c | |
| parent | da74ae3e32374755e0fbdfed4074cf839a82f615 (diff) | |
| parent | 74aeaabc3e452b29bc1b9eac5aa48923569f8a4e (diff) | |
Merge branch 'topic/hda-next' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 7c1eb23f0ce..07601070815 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -86,8 +86,6 @@ struct conexant_spec { /* dynamic controls, init_verbs and input_mux */ struct auto_pin_cfg autocfg; - unsigned int num_kctl_alloc, num_kctl_used; - struct snd_kcontrol_new *kctl_alloc; struct hda_input_mux private_imux; hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; @@ -344,15 +342,6 @@ static int conexant_init(struct hda_codec *codec) static void conexant_free(struct hda_codec *codec) { - struct conexant_spec *spec = codec->spec; - unsigned int i; - - if (spec->kctl_alloc) { - for (i = 0; i < spec->num_kctl_used; i++) - kfree(spec->kctl_alloc[i].name); - kfree(spec->kctl_alloc); - } - kfree(codec->spec); } |