ASoC: rt5514-spi: Let the buf_size to align with period_bytes
authorOder Chiou <oder_chiou@realtek.com>
Wed, 8 Nov 2017 11:21:47 +0000 (19:21 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 8 Nov 2017 11:26:56 +0000 (11:26 +0000)
The patch lets the buf_size to align with period_bytes to prevent the
buffer reading over the real size of the DSP buffer and also avoid to
calculate the wrong size of remaining data.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5514-spi.c

index 12f2ecf3a4feeb3a6133012b33b5b10cad33999f..0896817ffc3f82b56608693365a0c5f9be9c18e4 100644 (file)
@@ -147,8 +147,13 @@ done:
 
 static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp)
 {
+       size_t period_bytes;
        u8 buf[8];
 
+       if (!rt5514_dsp->substream)
+               return;
+
+       period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream);
        rt5514_dsp->get_size = 0;
 
        /**
@@ -176,6 +181,10 @@ static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp)
 
        rt5514_dsp->buf_size = rt5514_dsp->buf_limit - rt5514_dsp->buf_base;
 
+       if (rt5514_dsp->buf_size % period_bytes)
+               rt5514_dsp->buf_size = (rt5514_dsp->buf_size / period_bytes) *
+                       period_bytes;
+
        if (rt5514_dsp->buf_base && rt5514_dsp->buf_limit &&
                rt5514_dsp->buf_rp && rt5514_dsp->buf_size)
                schedule_delayed_work(&rt5514_dsp->copy_work, 0);