Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7084ffbf authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: topology: Fix TLV size calculation. 



TLV size calculation was incorrectly calculated. Fix this according to
include/sound/tlv.h

Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 11e68886

sound/soc/soc-topology.c

+10 −11
Original line number Diff line number Diff line
@@ -580,27 +580,26 @@ static int soc_tplg_init_kcontrol(struct soc_tplg *tplg, 
}



static int soc_tplg_create_tlv(struct soc_tplg *tplg,

	struct snd_kcontrol_new *kc, u32 tlv_size)

	struct snd_kcontrol_new *kc, struct snd_soc_tplg_ctl_tlv *tplg_tlv)

{

	struct snd_soc_tplg_ctl_tlv *tplg_tlv;

	struct snd_ctl_tlv *tlv;

	int size;



	if (tlv_size == 0)

	if (tplg_tlv->count == 0)

		return 0;



	tplg_tlv = (struct snd_soc_tplg_ctl_tlv *) tplg->pos;

	tplg->pos += tlv_size;



	tlv = kzalloc(sizeof(*tlv) + tlv_size, GFP_KERNEL);

	size = ((tplg_tlv->count + (sizeof(unsigned int) - 1)) &

		~(sizeof(unsigned int) - 1));

	tlv = kzalloc(sizeof(*tlv) + size, GFP_KERNEL);

	if (tlv == NULL)

		return -ENOMEM;



	dev_dbg(tplg->dev, " created TLV type %d size %d bytes\n",

		tplg_tlv->numid, tplg_tlv->size);

		tplg_tlv->numid, size);



	tlv->numid = tplg_tlv->numid;

	tlv->length = tplg_tlv->size;

	memcpy(tlv->tlv, tplg_tlv + 1, tplg_tlv->size);

	tlv->length = size;

	memcpy(&tlv->tlv[0], tplg_tlv->data, size);

	kc->tlv.p = (void *)tlv;



	return 0;
@@ -773,7 +772,7 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count, 
		}



		/* create any TLV data */

		soc_tplg_create_tlv(tplg, &kc, mc->hdr.tlv_size);

		soc_tplg_create_tlv(tplg, &kc, &mc->tlv);



		/* register control here */

		err = soc_tplg_add_kcontrol(tplg, &kc,