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

Commit 7c9190f7 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: compress: Pass error out of soc_compr_pointer 



Both soc_compr_pointer and the platform driver pointer callback return
ints but current soc_compr_pointer always returns 0. Update this so we
return the actual value from the platform driver callback. This doesn't
fix any issues simply makes the code more consistent.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a4f2d87c

sound/soc/soc-compress.c

+3 −2
Original line number Diff line number Diff line
@@ -530,14 +530,15 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, 
{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_platform *platform = rtd->platform;

	int ret = 0;



	mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);



	if (platform->driver->compr_ops && platform->driver->compr_ops->pointer)

		 platform->driver->compr_ops->pointer(cstream, tstamp);

		ret = platform->driver->compr_ops->pointer(cstream, tstamp);



	mutex_unlock(&rtd->pcm_mutex);

	return 0;

	return ret;

}



static int soc_compr_copy(struct snd_compr_stream *cstream,