ALSA: HDA: Fix naming of input jacks for IDT parser
authorDavid Henningsson <david.henningsson@canonical.com>
Mon, 3 Oct 2011 14:25:42 +0000 (16:25 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 3 Oct 2011 15:25:38 +0000 (17:25 +0200)
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>
sound/pci/hda/patch_sigmatel.c

index 987e3cf..dd977b6 100644 (file)
@@ -4130,22 +4130,14 @@ static int stac92xx_add_jack(struct hda_codec *codec,
 #ifdef CONFIG_SND_HDA_INPUT_JACK
        int def_conf = snd_hda_codec_get_pincfg(codec, nid);
        int connectivity = get_defcfg_connect(def_conf);
-       char name[32];
-       int err;
 
        if (connectivity && connectivity != AC_JACK_PORT_FIXED)
                return 0;
 
-       snprintf(name, sizeof(name), "%s at %s %s Jack",
-               snd_hda_get_jack_type(def_conf),
-               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 snd_hda_input_jack_add(codec, nid, type, NULL);
+#else
        return 0;
+#endif /* CONFIG_SND_HDA_INPUT_JACK */
 }
 
 static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid,