diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-22 15:47:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-22 15:47:23 +0100 |
| commit | 44fedd7da485bafcc5eee8794fa54cfc0c047dd4 (patch) | |
| tree | 3a6e3dd5f5c3ef4b4bde4026c6b50197d95ddf7d /sound/soc/amd | |
| parent | 3bec6fa3cdd338860d4b7d4110a49292646d801e (diff) | |
| parent | 1b31de922e28de2bf2078b7a1e341ad4aee6aa03 (diff) | |
Merge branch 'asoc-4.18' into asoc-4.19 for amd dep
Diffstat (limited to 'sound/soc/amd')
| -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); |