From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49E00C433E6 for ; Thu, 31 Dec 2020 18:16:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13EA1223DB for ; Thu, 31 Dec 2020 18:16:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727429AbgLaSQ0 (ORCPT ); Thu, 31 Dec 2020 13:16:26 -0500 Received: from jabberwock.ucw.cz ([46.255.230.98]:42734 "EHLO jabberwock.ucw.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727372AbgLaSQZ (ORCPT ); Thu, 31 Dec 2020 13:16:25 -0500 Received: by jabberwock.ucw.cz (Postfix, from userid 1017) id 0603B1C0B79; Thu, 31 Dec 2020 19:15:43 +0100 (CET) Date: Thu, 31 Dec 2020 19:15:42 +0100 From: Pavel Machek To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, stable@kernel.org, Connor McAdams , Takashi Iwai Subject: Re: [PATCH 4.19 267/346] ALSA: hda/ca0132 - Change Input Source enum strings. Message-ID: <20201231181542.GA28026@amd> References: <20201228124919.745526410@linuxfoundation.org> <20201228124932.680293903@linuxfoundation.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="h31gzZEtNLTqOjlF" Content-Disposition: inline In-Reply-To: <20201228124932.680293903@linuxfoundation.org> User-Agent: Mutt/1.5.23 (2014-03-12) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi! > From: Connor McAdams >=20 > commit 7079f785b50055a32b72eddcb7d9ba5688db24d0 upstream. >=20 > Change the Input Source enumerated control's strings to make it play > nice with pulseaudio. > +++ b/sound/pci/hda/patch_ca0132.c > @@ -106,7 +106,7 @@ enum { > }; > =20 > /* Strings for Input Source Enum Control */ > -static const char *const in_src_str[3] =3D {"Rear Mic", "Line", "Front M= ic" }; > +static const char *const in_src_str[3] =3D { "Microphone", "Line In", "F= ront Microphone" }; > #define IN_SRC_NUM_OF_INPUTS 3 If pulseaudio expects the strings to be from small set, should we have defines for them? If pulseaudio can't understand short versions, do these need fixing, too? hda_auto_parser.c: "Internal Mic", "Dock Mic", "Mic", "Rear Mic", "Front M= ic" hda_auto_parser.c: return "Headset Mic"; hda_auto_parser.c: return "Headphone Mic"; hda_auto_parser.c: return "Mic"; hda_auto_parser.c: return "Headphone Mic"; hda_jack.c: cfg, "Headphone Mic"); hda_jack.c: cfg, "Headphone Mic"); hda_proc.c: "Line In", "Aux", "Mic", "Telephony", Best regards, Pavel --=20 http://www.livejournal.com/~pavelmachek --h31gzZEtNLTqOjlF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAl/uFU4ACgkQMOfwapXb+vIc4wCgho+qPygudvptuabw+9ZymCzy qNkAnAw88I21GQc44txhYx0yy8PT0wAF =xyUr -----END PGP SIGNATURE----- --h31gzZEtNLTqOjlF--