Skip to contentSkip to conversation

ASoC: blackfin: use samples to set silence

PATCH New Scott Jiang 2 participants 3 messages Jul 17, 2014

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Scott Jiang

author
#0 lore raw

PATCH 1/1 ASoC: blackfin: use samples to set silence

The third parameter for snd_pcm_format_set_silence needs the number of samples instead of sample bytes.

Signed-off-by Scott Jiang <[email protected]>
---
 sound/soc/blackfin/bf5xx-i2s-pcm.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/blackfin/bf5xx-i2s-pcm.c +4 -4
index a3881c4..bcf5913 100644
@@ -290,19 +290,19 @@ static int bf5xx_pcm_silence(struct snd_pcm_substream *substream,
 	unsigned int sample_size = runtime->sample_bits / 8;
 	void *buf = runtime->dma_area;
 	struct bf5xx_i2s_pcm_data *dma_data;
-	unsigned int offset, size;
+	unsigned int offset, samples;
 
 	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
 	if (dma_data->tdm_mode) {
 		offset = pos * 8 * sample_size;
-		size = count * 8 * sample_size;
+		samples = count * 8;
 	} else {
 		offset = frames_to_bytes(runtime, pos);
-		size = frames_to_bytes(runtime, count);
+		samples = count * runtime->channels;
 	}
 
-	snd_pcm_format_set_silence(runtime->format, buf + offset, size);
+	snd_pcm_format_set_silence(runtime->format, buf + offset, samples);
 
 	return 0;
 }
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/1 ASoC: blackfin: use samples to set silence

The third parameter for snd_pcm_format_set_silence needs the number of samples instead of sample bytes.

Signed-off-by Scott Jiang <[email protected]>
---
 sound/soc/blackfin/bf5xx-i2s-pcm.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/blackfin/bf5xx-i2s-pcm.c +4 -4
index a3881c4..bcf5913 100644
@@ -290,19 +290,19 @@ static int bf5xx_pcm_silence(struct snd_pcm_substream *substream,
 	unsigned int sample_size = runtime->sample_bits / 8;
 	void *buf = runtime->dma_area;
 	struct bf5xx_i2s_pcm_data *dma_data;
-	unsigned int offset, size;
+	unsigned int offset, samples;
 
 	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
 	if (dma_data->tdm_mode) {
 		offset = pos * 8 * sample_size;
-		size = count * 8 * sample_size;
+		samples = count * 8;
 	} else {
 		offset = frames_to_bytes(runtime, pos);
-		size = frames_to_bytes(runtime, count);
+		samples = count * runtime->channels;
 	}
 
-	snd_pcm_format_set_silence(runtime->format, buf + offset, size);
+	snd_pcm_format_set_silence(runtime->format, buf + offset, samples);
 
 	return 0;
 }
Signature · 1 line
1.7.9.5
maintainer Applied
#2 lore raw
Quoted 2 lines · Scott Jiang

The third parameter for snd_pcm_format_set_silence needs the number of samples instead of sample bytes.

Applied, thanks.