Merge branch 'asoc-4.18' into asoc-4.19 for amd dep

This commit is contained in:
Mark Brown
2018-06-22 15:47:23 +01:00
7 changed files with 63 additions and 14 deletions

View File

@@ -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);