Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2eb1dc31 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents e87a925f 8f70e515

sound/soc/soc-compress.c

+5 −1
Original line number Diff line number Diff line
@@ -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");

	}

sound/soc/soc-pcm.c

+5 −1
Original line number Diff line number Diff line
@@ -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");

	}