Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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/859704
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

David Henningsson and committed by
Takashi Iwai
eb335a40 14bc52b8

+3 -11
+3 -11
sound/pci/hda/patch_sigmatel.c
··· 4130 4130 #ifdef CONFIG_SND_HDA_INPUT_JACK 4131 4131 int def_conf = snd_hda_codec_get_pincfg(codec, nid); 4132 4132 int connectivity = get_defcfg_connect(def_conf); 4133 - char name[32]; 4134 - int err; 4135 4133 4136 4134 if (connectivity && connectivity != AC_JACK_PORT_FIXED) 4137 4135 return 0; 4138 4136 4139 - snprintf(name, sizeof(name), "%s at %s %s Jack", 4140 - snd_hda_get_jack_type(def_conf), 4141 - snd_hda_get_jack_connectivity(def_conf), 4142 - snd_hda_get_jack_location(def_conf)); 4143 - 4144 - err = snd_hda_input_jack_add(codec, nid, type, name); 4145 - if (err < 0) 4146 - return err; 4147 - #endif /* CONFIG_SND_HDA_INPUT_JACK */ 4137 + return snd_hda_input_jack_add(codec, nid, type, NULL); 4138 + #else 4148 4139 return 0; 4140 + #endif /* CONFIG_SND_HDA_INPUT_JACK */ 4149 4141 } 4150 4142 4151 4143 static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid,