diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-03-20 11:47:36 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@ti.com> | 2012-05-22 17:33:19 +0100 |
| commit | ce37f5ea4b77171952aacd829e8f346b78191a7b (patch) | |
| tree | 22416384fa6bb13354d02d6df9b75f767f32ef51 /sound | |
| parent | 35d210faa17e46897771fcf0d78df7f952b0f9b0 (diff) | |
| download | linux-stable-ce37f5ea4b77171952aacd829e8f346b78191a7b.tar.gz linux-stable-ce37f5ea4b77171952aacd829e8f346b78191a7b.tar.bz2 linux-stable-ce37f5ea4b77171952aacd829e8f346b78191a7b.zip | |
ASoC: omap-mcbsp: buffer size constraint only applies to playback stream
In capture stream the buffer size does not need to be constrained to be
bigger then the McBSP FIFO.
In capture the FIFO content is taken out in period length burst, this
enusres that the FIFO is not going to overflow.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 27144a67e5ec..1046083e90a0 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -138,13 +138,15 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream, if (mcbsp->pdata->buffer_size) { /* * Rule for the buffer size. We should not allow - * smaller buffer than the FIFO size to avoid underruns + * smaller buffer than the FIFO size to avoid underruns. + * This applies only for the playback stream. */ - snd_pcm_hw_rule_add(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_BUFFER_SIZE, - omap_mcbsp_hwrule_min_buffersize, - mcbsp, - SNDRV_PCM_HW_PARAM_CHANNELS, -1); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + snd_pcm_hw_rule_add(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_BUFFER_SIZE, + omap_mcbsp_hwrule_min_buffersize, + mcbsp, + SNDRV_PCM_HW_PARAM_CHANNELS, -1); /* Make sure, that the period size is always even */ snd_pcm_hw_constraint_step(substream->runtime, 0, |