Commit eb335a40 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai

ALSA: HDA: Fix naming of input jacks for IDT parser

The Sigmatel/IDT parser should have the same naming convention
for input jacks as the other codecs have.

BugLink: http://bugs.launchpad.net/bugs/859704Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 14bc52b8
...@@ -4130,22 +4130,14 @@ static int stac92xx_add_jack(struct hda_codec *codec, ...@@ -4130,22 +4130,14 @@ static int stac92xx_add_jack(struct hda_codec *codec,
#ifdef CONFIG_SND_HDA_INPUT_JACK #ifdef CONFIG_SND_HDA_INPUT_JACK
int def_conf = snd_hda_codec_get_pincfg(codec, nid); int def_conf = snd_hda_codec_get_pincfg(codec, nid);
int connectivity = get_defcfg_connect(def_conf); int connectivity = get_defcfg_connect(def_conf);
char name[32];
int err;
if (connectivity && connectivity != AC_JACK_PORT_FIXED) if (connectivity && connectivity != AC_JACK_PORT_FIXED)
return 0; return 0;
snprintf(name, sizeof(name), "%s at %s %s Jack", return snd_hda_input_jack_add(codec, nid, type, NULL);
snd_hda_get_jack_type(def_conf), #else
snd_hda_get_jack_connectivity(def_conf),
snd_hda_get_jack_location(def_conf));
err = snd_hda_input_jack_add(codec, nid, type, name);
if (err < 0)
return err;
#endif /* CONFIG_SND_HDA_INPUT_JACK */
return 0; return 0;
#endif /* CONFIG_SND_HDA_INPUT_JACK */
} }
static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid, static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment