diff options
| author | Mark Brown <broonie@kernel.org> | 2019-10-02 12:50:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-02 12:50:40 +0100 |
| commit | 25317997cbcd0497a9460f79c322e0fde0b5b1a9 (patch) | |
| tree | 215512440bd5a9ce931789d7c0f24d47e7c5d572 /sound/soc/soc-pcm.c | |
| parent | 3a9e204d4e36904a464a2e53206b053a7ffc7bad (diff) | |
| parent | 2bdf194e2030fce4f2e91300817338353414ab3b (diff) | |
Merge branch 'asoc-5.4' into asoc-5.5
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e7a04c892817..66910500e3b6 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1070,7 +1070,7 @@ static int soc_pcm_trigger_start(struct snd_pcm_substream *substream, int cmd) return ret; } - snd_soc_dai_trigger(cpu_dai, substream, cmd); + ret = snd_soc_dai_trigger(cpu_dai, substream, cmd); if (ret < 0) return ret; @@ -1155,7 +1155,7 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream, return ret; } - snd_soc_dai_bespoke_trigger(cpu_dai, substream, cmd); + ret = snd_soc_dai_bespoke_trigger(cpu_dai, substream, cmd); if (ret < 0) return ret; |