]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: compress: Pass error out of soc_compr_pointer
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Mon, 20 Jun 2016 08:51:32 +0000 (09:51 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 22 Jun 2016 15:16:02 +0000 (16:16 +0100)
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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-compress.c

index 875733c52953a6a3ec13ac2f0c932bb695ae5b3e..d2df46c14c6823599c6210b3a31c9b1aa60ce72e 100644 (file)
@@ -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,