[alsa-devel] [PATCH] ASoC: topology: create tlv before soc_tplg_init_kcontrol
Pierre-Louis Bossart
pierre-louis.bossart at linux.intel.com
Thu Mar 14 06:12:04 CET 2019
On 3/13/19 8:49 AM, Bard liao wrote:
> Component driver may want to use tlv data. Create tlv before
> soc_tplg_init_kcontrol so component driver can use the tlv data
> in the control_load ops.
>
> Signed-off-by: Bard liao <yung-chuan.liao at linux.intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
> ---
> sound/soc/soc-topology.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
> index 25fca7055464..fbee4720b834 100644
> --- a/sound/soc/soc-topology.c
> +++ b/sound/soc/soc-topology.c
> @@ -894,19 +894,20 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count,
> continue;
> }
>
> + /* create any TLV data */
> + soc_tplg_create_tlv(tplg, &kc, &mc->hdr);
> +
> /* pass control to driver for optional further init */
> err = soc_tplg_init_kcontrol(tplg, &kc,
> (struct snd_soc_tplg_ctl_hdr *) mc);
> if (err < 0) {
> dev_err(tplg->dev, "ASoC: failed to init %s\n",
> mc->hdr.name);
> + soc_tplg_free_tlv(tplg, &kc);
> kfree(sm);
> continue;
> }
>
> - /* create any TLV data */
> - soc_tplg_create_tlv(tplg, &kc, &mc->hdr);
> -
> /* register control here */
> err = soc_tplg_add_kcontrol(tplg, &kc,
> &sm->dobj.control.kcontrol);
> @@ -1324,18 +1325,19 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create(
> continue;
> }
>
> + /* create any TLV data */
> + soc_tplg_create_tlv(tplg, &kc[i], &mc->hdr);
> +
> /* pass control to driver for optional further init */
> err = soc_tplg_init_kcontrol(tplg, &kc[i],
> (struct snd_soc_tplg_ctl_hdr *)mc);
> if (err < 0) {
> dev_err(tplg->dev, "ASoC: failed to init %s\n",
> mc->hdr.name);
> + soc_tplg_free_tlv(tplg, &kc[i]);
> kfree(sm);
> continue;
> }
> -
> - /* create any TLV data */
> - soc_tplg_create_tlv(tplg, &kc[i], &mc->hdr);
> }
> return kc;
>
>
More information about the Alsa-devel
mailing list