ASoC: rockchip: multi_dais_pcm: refine dma slave config

Sugar Zhang · rkhuangtao · commit 08725d4ae92f · 2018-06-26T14:17:48.000+08:00
This patch refine dma slave config only when interlace size is valid.

Change-Id: If02cec29083d5f582ccd0efcd78e7a6547d2df66
Signed-off-by: Sugar Zhang &lt;sugar.zhang@rock-chips.com&gt;
diff --git a/sound/soc/rockchip/rockchip_multi_dais_pcm.c b/sound/soc/rockchip/rockchip_multi_dais_pcm.c
@@ -271,14 +271,16 @@ static int dmaengine_mpcm_hw_params(struct snd_pcm_substream *substream,
 		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 			chan = pcm->tx_chans[i];
 			if (sz) {
-				slave_config.dst_maxburst = sz / slave_config.dst_addr_width;
 				slave_config.src_interlace_size = frame_bytes - sz;
+				if (slave_config.src_interlace_size)
+					slave_config.dst_maxburst = sz / slave_config.dst_addr_width;
 			}
 		} else {
 			chan = pcm->rx_chans[i];
 			if (sz) {
-				slave_config.src_maxburst = sz / slave_config.src_addr_width;
 				slave_config.dst_interlace_size = frame_bytes - sz;
+				if (slave_config.dst_interlace_size)
+					slave_config.src_maxburst = sz / slave_config.src_addr_width;
 			}
 		}
 		if (!chan)

Original file line number	Diff line number	Diff line change
`@@ -271,14 +271,16 @@ static int dmaengine_mpcm_hw_params(struct snd_pcm_substream *substream,`
`271`	`271`	`if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {`
`272`	`272`	`chan = pcm->tx_chans[i];`
`273`	`273`	`if (sz) {`
`274`		`- slave_config.dst_maxburst = sz / slave_config.dst_addr_width;`
`275`	`274`	`slave_config.src_interlace_size = frame_bytes - sz;`
	`275`	`+ if (slave_config.src_interlace_size)`
	`276`	`+ slave_config.dst_maxburst = sz / slave_config.dst_addr_width;`
`276`	`277`	`}`
`277`	`278`	`} else {`
`278`	`279`	`chan = pcm->rx_chans[i];`
`279`	`280`	`if (sz) {`
`280`		`- slave_config.src_maxburst = sz / slave_config.src_addr_width;`
`281`	`281`	`slave_config.dst_interlace_size = frame_bytes - sz;`
	`282`	`+ if (slave_config.dst_interlace_size)`
	`283`	`+ slave_config.src_maxburst = sz / slave_config.src_addr_width;`
`282`	`284`	`}`
`283`	`285`	`}`
`284`	`286`	`if (!chan)`