From 5316c288898f3e3f484b2cd9b798f2494b7acf7c Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Mon, 3 Oct 2011 16:25:42 +0200 Subject: [PATCH] --- yaml --- r: 270379 b: refs/heads/master c: eb335a40ca050328f30db28ae4ce63cb07466d22 h: refs/heads/master i: 270377: ed29d839fba3d289d24ac29f7f0f1121fa283074 270375: 58c9e11df17bdb7a812488ee1f34cbf165c9f2f7 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 2653bef5104d..178f0332f86c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14bc52b8feaae6cbc88934399f418125ac176399 +refs/heads/master: eb335a40ca050328f30db28ae4ce63cb07466d22 diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index 987e3cf71a0b..dd977b647e78 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -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,