aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-26 15:24:49 +0000
committerMark Brown <broonie@kernel.org>2018-01-26 15:24:49 +0000
commit2f75ab7fff02addff8f43d27b4866922d71e44b5 (patch)
treeeffca5d873237f6751bee17a7125a078130adb99 /sound/soc
parente5acfc7d3562ae251cb786b5b52d4345dd16a02c (diff)
parent290df4d3ab192821b66857c05346b23056ee9545 (diff)
Merge branch 'fix/compress' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-compress
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-compress.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 81232f4ab614..7973f92cd40f 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -944,7 +944,7 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
struct snd_soc_platform *platform = rtd->platform;
struct snd_soc_component *component;
struct snd_soc_rtdcom_list *rtdcom;
- int ret = 0, __ret;
+ int ret = 0;
mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -965,10 +965,10 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
!component->driver->compr_ops->copy)
continue;
- __ret = component->driver->compr_ops->copy(cstream, buf, count);
- if (__ret < 0)
- ret = __ret;
+ ret = component->driver->compr_ops->copy(cstream, buf, count);
+ break;
}
+
err:
mutex_unlock(&rtd->pcm_mutex);
return ret;

Privacy Policy