]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: topology: Fix incorrect addressing assignments
authorTang Bin <tangbin@cmss.chinamobile.com>
Sat, 14 Sep 2024 08:16:08 +0000 (16:16 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Oct 2024 10:03:02 +0000 (12:03 +0200)
[ Upstream commit 85109780543b5100aba1d0842b6a7c3142be74d2 ]

The variable 'kc' is handled in the function
soc_tplg_control_dbytes_create(), and 'kc->private_value'
is assigned to 'sbe', so In the function soc_tplg_dbytes_create(),
the right 'sbe' should be 'kc.private_value', the same logical error
in the function soc_tplg_dmixer_create(), thus fix them.

Fixes: 0867278200f7 ("ASoC: topology: Unify code for creating standalone and widget bytes control")
Fixes: 4654ca7cc8d6 ("ASoC: topology: Unify code for creating standalone and widget mixer control")
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://patch.msgid.link/20240914081608.3514-1-tangbin@cmss.chinamobile.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/soc-topology.c

index af5d42b57be7eb5c7c228a601e3387d23081a147..3d82570293b29fc01a6fe51f70a72620132f4e59 100644 (file)
@@ -889,7 +889,7 @@ static int soc_tplg_dbytes_create(struct soc_tplg *tplg, size_t size)
                return ret;
 
        /* register dynamic object */
-       sbe = (struct soc_bytes_ext *)&kc.private_value;
+       sbe = (struct soc_bytes_ext *)kc.private_value;
 
        INIT_LIST_HEAD(&sbe->dobj.list);
        sbe->dobj.type = SND_SOC_DOBJ_BYTES;
@@ -923,7 +923,7 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, size_t size)
                return ret;
 
        /* register dynamic object */
-       sm = (struct soc_mixer_control *)&kc.private_value;
+       sm = (struct soc_mixer_control *)kc.private_value;
 
        INIT_LIST_HEAD(&sm->dobj.list);
        sm->dobj.type = SND_SOC_DOBJ_MIXER;