diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2012-03-01 08:12:10 -0800 |
|---|---|---|
| committer | Tim Gardner <tim.gardner@canonical.com> | 2012-03-19 11:27:53 -0600 |
| commit | 4b580c09794e7d142c8ae91cdb7eae62764c4f12 (patch) | |
| tree | 6652551c6ac0917e86f4fd229e54c16e01f2d5e4 | |
| parent | 058b017ea9d67913c1cd7b10966ac4de28239600 (diff) | |
Revert "ALSA: hda - Fix redundant jack creations for cx5051"upstream-stable
This reverts commit 2a8e5e8a2df18812c60720fa0534c29c9f1c17b6.
We're carrying the re-designed jack layer from v3.3, so this patch is
not needed.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index ae949293ff0..b3728e51671 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -1899,10 +1899,6 @@ static void cxt5051_init_mic_port(struct hda_codec *codec, hda_nid_t nid, snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | event); -} - -static void cxt5051_init_mic_jack(struct hda_codec *codec, hda_nid_t nid) -{ snd_hda_input_jack_add(codec, nid, SND_JACK_MICROPHONE, NULL); snd_hda_input_jack_report(codec, nid); } @@ -1920,6 +1916,7 @@ static int cxt5051_init(struct hda_codec *codec) struct conexant_spec *spec = codec->spec; conexant_init(codec); + conexant_init_jacks(codec); if (spec->auto_mic & AUTO_MIC_PORTB) cxt5051_init_mic_port(codec, 0x17, CXT5051_PORTB_EVENT); @@ -2040,12 +2037,6 @@ static int patch_cxt5051(struct hda_codec *codec) if (spec->beep_amp) snd_hda_attach_beep_device(codec, spec->beep_amp); - conexant_init_jacks(codec); - if (spec->auto_mic & AUTO_MIC_PORTB) - cxt5051_init_mic_jack(codec, 0x17); - if (spec->auto_mic & AUTO_MIC_PORTC) - cxt5051_init_mic_jack(codec, 0x18); - return 0; } |