From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Feb 2012 02:35:12 +0000 (-0800)
Subject: Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533;p=linux-beck.git

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
---

fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533
diff --cc sound/soc/sh/fsi.c
index 79a0afb78725,ea4a82d01160..13746809c27d
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -1210,13 -1151,9 +1210,9 @@@ static int fsi_hw_free(struct snd_pcm_s
  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_get_stream(fsi, fsi_is_play(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 = {