ASoC: soc-pcm: fix dpcm_path_get error handling
dpcm_path_get may return -ENOMEM when allocating memory for list fails. We should not keep processing path or start up dpcm dai in this case. Signed-off-by: Qiao Zhou <zhouqiao@marvell.com> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
7d1311b93e
Коммит
8f70e515a8
|
@ -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");
|
||||
}
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче