ASoC: rt5514-spi: Get the period_bytes in the copy work to make sure the value correctly

[sfrench/cifs-2.6.git] / sound / soc / codecs / rt5514-spi.c

diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c
index 18686ffb0cd5738419e5bcee1479d924b63c6487..13809821e1f8547c3b012fd53a6e3a3ea9f588f5 100644 (file)
--- a/sound/soc/codecs/rt5514-spi.c
+++ b/sound/soc/codecs/rt5514-spi.c
@@ -91,6 +91,14 @@ static void rt5514_spi_copy_work(struct work_struct *work)
 
        runtime = rt5514_dsp->substream->runtime;
        period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream);
+       if (!period_bytes) {
+               schedule_delayed_work(&rt5514_dsp->copy_work, 5);
+               goto done;
+       }
+
+       if (rt5514_dsp->buf_size % period_bytes)
+               rt5514_dsp->buf_size = (rt5514_dsp->buf_size / period_bytes) *
+                       period_bytes;
 
        if (rt5514_dsp->get_size >= rt5514_dsp->buf_size) {
                rt5514_spi_burst_read(RT5514_BUFFER_VOICE_WP, (u8 *)&buf,
@@ -149,13 +157,11 @@ 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;
 
        /**
@@ -183,10 +189,6 @@ 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);