diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2016-06-20 09:51:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-22 16:16:02 +0100 |
| commit | 7c9190f7e7428487cd67839f9a547efcc9ec3b9b (patch) | |
| tree | 2f3833ccf79df920f1898b2e3914461d14a08cff /sound | |
| parent | a4f2d87c63571d4cd9467d369f2fbf2362646043 (diff) | |
| download | linux-7c9190f7e7428487cd67839f9a547efcc9ec3b9b.tar.bz2 | |
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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-compress.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 875733c52953..d2df46c14c68 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -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, |