| Message ID | 20240914081608.3514-1-tangbin@cmss.chinamobile.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 85109780543b5100aba1d0842b6a7c3142be74d2 |
| Headers | show |
| Series | ASoC: topology: Fix incorrect addressing assignments | expand |
On 9/14/2024 10:16 AM, Tang Bin wrote: > 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> > --- My mistake, thanks! Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
On Sat, 14 Sep 2024 16:16:08 +0800, Tang Bin wrote: > 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. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: topology: Fix incorrect addressing assignments commit: 85109780543b5100aba1d0842b6a7c3142be74d2 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index af3158cdc..97517423d 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -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;
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> --- sound/soc/soc-topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)