summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-19 18:35:12 -0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-19 18:35:12 -0800
commitfa2c8f401797eee814b7b9fa0b23fa6c4c3f5533 (patch)
tree826fb23071b866e112d6e9c510fe3ad4d668acdc /sound/soc/sh
parenta387419612f9c246701a5080bccecf3c04f65277 (diff)
parentb01543dfe67bb1d191998e90d20534dc354de059 (diff)
downloadblackbird-op-linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.tar.gz
blackbird-op-linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.zip
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the dmaeengine conversion that depends on this resolution. Linux 3.3-rc4 Conflicts: sound/soc/sh/fsi.c
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/fsi.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 79a0afb78725..13746809c27d 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 = {
OpenPOWER on IntegriCloud