diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-18 10:30:14 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-18 10:30:14 -0700 |
| commit | 90fbeb0cabf75e7ab04f4a13a237cd8ccb4544d9 (patch) | |
| tree | f8d540943df9eaaba2001bcaa257624074d89441 /sound/soc/codecs/rt5514-spi.c | |
| parent | bf0fa00fd8410b377a3403adb58e32fc703e86e8 (diff) | |
| parent | 3f24f37adbc9a1059420a9c8f857e3490a4bce5e (diff) | |
| download | linux-90fbeb0cabf75e7ab04f4a13a237cd8ccb4544d9.tar.bz2 | |
Merge branch 'asoc-4.19' into asoc-4.20 for rt5682 deps.
Diffstat (limited to 'sound/soc/codecs/rt5514-spi.c')
| -rw-r--r-- | sound/soc/codecs/rt5514-spi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 6478d10c4f4a..4d46f4567c3a 100644 --- 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); |