diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
| commit | 9db028827315550ea7e65898eebaf15d2456d830 (patch) | |
| tree | 4ba3067537cfd0d809fcac0396b2dab986c9930b /sound/soc/amd/raven/acp3x-pcm-dma.c | |
| parent | ALSA: hda - Fix DP-MST support for NVIDIA codecs (diff) | |
| parent | ASoC: wcd934x: Add missing COMMON_CLK dependency (diff) | |
| download | linux-9db028827315550ea7e65898eebaf15d2456d830.tar.xz linux-9db028827315550ea7e65898eebaf15d2456d830.zip | |
Merge tag 'asoc-v5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.6
A collection of updates for bugs fixed since the initial pull
request, the most important one being the addition of COMMON_CLK
for wcd934x which is needed for MFD to be merged.
Diffstat (limited to 'sound/soc/amd/raven/acp3x-pcm-dma.c')
| -rw-r--r-- | sound/soc/amd/raven/acp3x-pcm-dma.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 5c3ec3c58e3b..aecc3c061679 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -349,13 +349,6 @@ static int acp3x_dma_close(struct snd_soc_component *component, component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - adata->play_stream = NULL; - adata->i2ssp_play_stream = NULL; - } else { - adata->capture_stream = NULL; - adata->i2ssp_capture_stream = NULL; - } /* Disable ACP irq, when the current stream is being closed and * another stream is also not active. @@ -363,6 +356,13 @@ static int acp3x_dma_close(struct snd_soc_component *component, if (!adata->play_stream && !adata->capture_stream && !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + adata->play_stream = NULL; + adata->i2ssp_play_stream = NULL; + } else { + adata->capture_stream = NULL; + adata->i2ssp_capture_stream = NULL; + } return 0; } |