iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2014-09-10 12:21:02 +01:00
commit 2eb1dc3179
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/soc-compress.c
View File

@ -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");
}

6
sound/soc/soc-pcm.c
View File

@ -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");
}