diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2013-04-11 11:30:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-11 11:59:41 +0200 |
| commit | b26b51166848758d740ab638fc27789228a51c97 (patch) | |
| tree | 802e748e52f20d4aab025599ed4819a22e7a556c /sound/pci/hda/hda_generic.c | |
| parent | 3cdbe11ae8d2eead564605b0d2193ac470d6b7e8 (diff) | |
| download | linux-b26b51166848758d740ab638fc27789228a51c97.tar.bz2 | |
ALSA: hda - Handle Headphone Mic jack more generic
Now that we have a flag for headphone mics, we can use that flag
in the jack creation instead of creating the jack manually.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index cc22d754843c..29be37f9f5a2 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -4366,17 +4366,6 @@ int snd_hda_gen_build_controls(struct hda_codec *codec) free_kctls(spec); /* no longer needed */ - if (spec->hp_mic_pin) { - int err; - int nid = spec->hp_mic_pin; - err = snd_hda_jack_add_kctl(codec, nid, "Headphone Mic", 0); - if (err < 0) - return err; - err = snd_hda_jack_detect_enable(codec, nid, 0); - if (err < 0) - return err; - } - err = snd_hda_jack_add_kctls(codec, &spec->autocfg); if (err < 0) return err; |