diff options
| author | Mark Brown <broonie@kernel.org> | 2022-11-29 12:55:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-11-29 12:55:51 +0000 |
| commit | aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64 (patch) | |
| tree | 3d80758082c0a3bc293761cc1a4cbac2e457b128 /sound/soc/soc-pcm.c | |
| parent | 863b9179cee4570e5da4206dcf8dbcdcc37c8348 (diff) | |
| parent | 3d1bb6cc1a654c8693a85b1d262e610196edec8b (diff) | |
| download | lwn-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.tar.gz lwn-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.zip | |
ASoC: Merge up fixes
Merge the fixes branch up so we can apply further AMD work.
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index d8e4677f3002..a7810c78ffa1 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -822,11 +822,6 @@ static int __soc_pcm_open(struct snd_soc_pcm_runtime *rtd, ret = snd_soc_dai_startup(dai, substream); if (ret < 0) goto err; - - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - dai->tx_mask = 0; - else - dai->rx_mask = 0; } /* Dynamic PCM DAI links compat checks use dynamic capabilities */ @@ -1252,6 +1247,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) |