Commit 675c67af authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.3' of git:// into for-linus

A simple fix from Morimoto-san for the pointer() operation in the FSI
parents a68f20ef 1987877d
......@@ -1152,12 +1152,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_get_stream(fsi, fsi_is_play(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 = {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment