diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-02-14 09:24:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-14 09:24:58 +0100 |
| commit | 675c67afb6a05907d9683ef176f41852bb1b5b9d (patch) | |
| tree | 3b10821811da038702364d1940bdac5b51261d17 | |
| parent | a68f20ef80e62b3dfed3097ad57ec88550cdabe7 (diff) | |
| parent | 1987877d869027ab63dc9df515e11f19279a8091 (diff) | |
| download | linux-675c67afb6a05907d9683ef176f41852bb1b5b9d.tar.gz linux-675c67afb6a05907d9683ef176f41852bb1b5b9d.tar.bz2 linux-675c67afb6a05907d9683ef176f41852bb1b5b9d.zip | |
Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
A simple fix from Morimoto-san for the pointer() operation in the FSI
driver.
| -rw-r--r-- | sound/soc/sh/fsi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index db6c89a28bda..ea4a82d01160 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -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 = { |