Commit 2f75ab7f authored by Mark Brown's avatar Mark Brown

Merge branch 'fix/compress' of...

Merge branch 'fix/compress' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-compress
parents e5acfc7d 290df4d3
...@@ -944,7 +944,7 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, ...@@ -944,7 +944,7 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
struct snd_soc_platform *platform = rtd->platform; struct snd_soc_platform *platform = rtd->platform;
struct snd_soc_component *component; struct snd_soc_component *component;
struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_rtdcom_list *rtdcom;
int ret = 0, __ret; int ret = 0;
mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
...@@ -965,10 +965,10 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, ...@@ -965,10 +965,10 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
!component->driver->compr_ops->copy) !component->driver->compr_ops->copy)
continue; continue;
__ret = component->driver->compr_ops->copy(cstream, buf, count); ret = component->driver->compr_ops->copy(cstream, buf, count);
if (__ret < 0) break;
ret = __ret;
} }
err: err:
mutex_unlock(&rtd->pcm_mutex); mutex_unlock(&rtd->pcm_mutex);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment