diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-09 14:46:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:46:56 +0100 |
| commit | 6c084839877666d987ff8bc4e0facd3c02d99d61 (patch) | |
| tree | 714675fae123ffbe42dd04892be2561ac34d1d8d /sound/soc/amd/acp-pcm-dma.c | |
| parent | 1ffaddd029c867d134a1dde39f540dcc8c52e274 (diff) | |
| parent | 0717edbdfed61b4c1e8291140f78882d3a481042 (diff) | |
Merge branch 'asoc-4.18' into asoc-linus
Diffstat (limited to 'sound/soc/amd/acp-pcm-dma.c')
| -rw-r--r-- | sound/soc/amd/acp-pcm-dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 77203841c535..1458b5048498 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -773,7 +773,8 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, if (WARN_ON(!rtd)) return -EINVAL; - rtd->i2s_instance = pinfo->i2s_instance; + if (pinfo) + rtd->i2s_instance = pinfo->i2s_instance; if (adata->asic_type == CHIP_STONEY) { val = acp_reg_read(adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN); |