| From a7a2edc574ad5ea06820d9c52a14a22981b8d6f0 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 8 Feb 2012 16:57:29 -0800 |
| Subject: ASoC: fsi: fixup fsi_pointer() calculation method |
| |
| current fsi_pointer() calculation was not correct for FSI driver. |
| This patch fix it up. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| (cherry picked from commit 1987877d869027ab63dc9df515e11f19279a8091) |
| |
| Conflicts: |
| |
| sound/soc/sh/fsi.c |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| sound/soc/sh/fsi.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c |
| index 79a0afb..1374680 100644 |
| --- a/sound/soc/sh/fsi.c |
| +++ b/sound/soc/sh/fsi.c |
| @@ -1211,12 +1211,8 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream) |
| { |
| struct fsi_priv *fsi = fsi_get_priv(substream); |
| struct fsi_stream *io = fsi_stream_get(fsi, substream); |
| - int samples_pos = io->buff_sample_pos - 1; |
| |
| - if (samples_pos < 0) |
| - samples_pos = 0; |
| - |
| - return fsi_sample2frame(fsi, samples_pos); |
| + return fsi_sample2frame(fsi, io->buff_sample_pos); |
| } |
| |
| static struct snd_pcm_ops fsi_pcm_ops = { |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |
