diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-15 15:05:33 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-15 15:05:33 -0700 |
| commit | af0f2ceadf87fc277afe1456f3c3fe3e69750aee (patch) | |
| tree | 768e524cf1bd9b579c7f4782565bd3f219147a4e /sound | |
| parent | 8dbc8950672f1d16aefc38c309f34f0d2139f1c0 (diff) | |
| parent | 8f70e515a8bb6a1908b40b786cb43f6491e8da04 (diff) | |
| download | lwn-af0f2ceadf87fc277afe1456f3c3fe3e69750aee.tar.gz lwn-af0f2ceadf87fc277afe1456f3c3fe3e69750aee.zip | |
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-compress.c | 6 | ||||
| -rw-r--r-- | sound/soc/soc-pcm.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 27c06acce205..3092b58fede6 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -101,7 +101,11 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].runtime = fe_substream->runtime; - if (dpcm_path_get(fe, stream, &list) <= 0) { + ret = dpcm_path_get(fe, stream, &list); + if (ret < 0) { + mutex_unlock(&fe->card->mutex); + goto fe_err; + } else if (ret == 0) { dev_dbg(fe->dev, "ASoC: %s no valid %s route\n", fe->dai_link->name, stream ? "capture" : "playback"); } diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 731fdb5b5f9b..642c86240752 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2352,7 +2352,11 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME); fe->dpcm[stream].runtime = fe_substream->runtime; - if (dpcm_path_get(fe, stream, &list) <= 0) { + ret = dpcm_path_get(fe, stream, &list); + if (ret < 0) { + mutex_unlock(&fe->card->mutex); + return ret; + } else if (ret == 0) { dev_dbg(fe->dev, "ASoC: %s no valid %s route\n", fe->dai_link->name, stream ? "capture" : "playback"); } |