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

From c883421ded828cec42ab90e55b36811593f2012e Mon Sep 17 00:00:00 2001

Actually, it's just Sigmatel that wants to make things its own way, making life harder for us in userspace. Make the driver more uniform by removing this code.

Signature · 4 lines

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
[2 0001-ALSA-HDA-Fix-naming-of-input-jacks-for-IDT-parser.patch <text/x-patch (7bit)>]

Quoted 1 line

From c883421ded828cec42ab90e55b36811593f2012e Mon Sep 17 00:00:00 2001

From: David Henningsson <[email protected]>
Date: Mon, 3 Oct 2011 16:25:42 +0200
Subject: [PATCH] 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 <[email protected]>

---
 sound/pci/hda/patch_sigmatel.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

sound/pci/hda/patch_sigmatel.c +3 -11

index 987e3cf..dd977b6 100644
@@ -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,

Signature · 1 line

1.7.5.4