mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-02-08 05:35:16 +07:00
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
This commit is contained in:
commit
758fc06da3
@ -1989,7 +1989,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
|
|||||||
|
|
||||||
paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);
|
paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);
|
||||||
if (paths < 0) {
|
if (paths < 0) {
|
||||||
dpcm_path_put(&list);
|
|
||||||
dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
|
dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
|
||||||
fe->dai_link->name, "playback");
|
fe->dai_link->name, "playback");
|
||||||
mutex_unlock(&card->mutex);
|
mutex_unlock(&card->mutex);
|
||||||
@ -2019,7 +2018,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
|
|||||||
|
|
||||||
paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);
|
paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);
|
||||||
if (paths < 0) {
|
if (paths < 0) {
|
||||||
dpcm_path_put(&list);
|
|
||||||
dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
|
dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
|
||||||
fe->dai_link->name, "capture");
|
fe->dai_link->name, "capture");
|
||||||
mutex_unlock(&card->mutex);
|
mutex_unlock(&card->mutex);
|
||||||
@ -2084,7 +2082,6 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
|
|||||||
fe->dpcm[stream].runtime = fe_substream->runtime;
|
fe->dpcm[stream].runtime = fe_substream->runtime;
|
||||||
|
|
||||||
if (dpcm_path_get(fe, stream, &list) <= 0) {
|
if (dpcm_path_get(fe, stream, &list) <= 0) {
|
||||||
dpcm_path_put(&list);
|
|
||||||
dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
|
dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
|
||||||
fe->dai_link->name, stream ? "capture" : "playback");
|
fe->dai_link->name, stream ? "capture" : "playback");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user