From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D7501DB153; Wed, 5 Feb 2025 14:44:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766669; cv=none; b=tn7Edn8bkpgQPpcvjScOz4OG8A/gs8gRhpZXk78oC1gkUDjuaYbA3ET24/Moc8rgXivzzaFdmFrKySZYYvIqSbauUSrG9jskkfJHe0CVettj/TuK64Ss08CT+8OBXxSX2U0b/Ff9kiXcaZ5BHCamebMiaGFucShc0QX39aiMnTY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766669; c=relaxed/simple; bh=zI5x1mfNBYwub5x9woaebtWH4Y4H/LcSk4felDg0f6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GrHr0aLKbkY4dnrCiUj1hexn29z2wfMPe5ed18JOgay0nK2EeUnC1BXf9ZFFGY2nKaf3kiGH9bDe8YbaETLHQ4dCzKVEWQjsNlxV0rio0PRiyQh0IjE5JNKmLOXTZME8zYZRpAzTofv6eOmYMImDqTP7lsyTECfxcAaSYZho82w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2skUCV2T; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2skUCV2T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AEB0C4CED1; Wed, 5 Feb 2025 14:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738766669; bh=zI5x1mfNBYwub5x9woaebtWH4Y4H/LcSk4felDg0f6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2skUCV2Tp9OL/LyfyFtDef7mYwB9FdB012/S2I2R2gLjMsmIH/JDiZqYl7UQa+rXi 4YrZEPszC6n9NDXQdWeBzeEpAaItroa44ReuMnrfY0ImsJjIIhJ1fsgDpQW4XlBRwx kh/dSgqKZQY4P0+gHvBwrJvZils8RqXVkFA/tiTs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Cezary Rojewski , Mark Brown , Sasha Levin Subject: [PATCH 6.13 296/623] ASoC: Intel: avs: Fix init-config parsing Date: Wed, 5 Feb 2025 14:40:38 +0100 Message-ID: <20250205134507.554046334@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134456.221272033@linuxfoundation.org> References: <20250205134456.221272033@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Amadeusz Sławiński [ Upstream commit e9ca3db9f01a7ce91ceab35cd5fa52f0c5aca174 ] When parsing init configs correct token should be looked up. Fixes: 1b4217ebbb3e ("ASoC: Intel: avs: Add topology parsing support for initial config") Signed-off-by: Amadeusz Sławiński Signed-off-by: Cezary Rojewski Link: https://patch.msgid.link/20250109122216.3667847-5-cezary.rojewski@intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/avs/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/topology.c b/sound/soc/intel/avs/topology.c index 5cda527020c7b..d612f20ed9893 100644 --- a/sound/soc/intel/avs/topology.c +++ b/sound/soc/intel/avs/topology.c @@ -1466,7 +1466,7 @@ avs_tplg_path_template_create(struct snd_soc_component *comp, struct avs_tplg *o static const struct avs_tplg_token_parser mod_init_config_parsers[] = { { - .token = AVS_TKN_MOD_INIT_CONFIG_ID_U32, + .token = AVS_TKN_INIT_CONFIG_ID_U32, .type = SND_SOC_TPLG_TUPLE_TYPE_WORD, .offset = offsetof(struct avs_tplg_init_config, id), .parse = avs_parse_word_token, @@ -1519,7 +1519,7 @@ static int avs_tplg_parse_initial_configs(struct snd_soc_component *comp, esize = le32_to_cpu(tuples->size) + le32_to_cpu(tmp->size); ret = parse_dictionary_entries(comp, tuples, esize, config, 1, sizeof(*config), - AVS_TKN_MOD_INIT_CONFIG_ID_U32, + AVS_TKN_INIT_CONFIG_ID_U32, mod_init_config_parsers, ARRAY_SIZE(mod_init_config_parsers)); -- 2.39.5