summaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-pcm.c
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2009-01-14 06:29:08 +0100
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2009-01-14 06:29:08 +0100
commitc088f4e9da74b901f7ed1749ad697d77622ed0f9 (patch)
tree84cddf20369f82f10c1c3712e6cce20dd1b9d863 /sound/soc/davinci/davinci-pcm.c
parentMerge branch 'for-linus' of git+ssh://git.melbourne.sgi.com/git/xfs (diff)
parentMerge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadlinux-c088f4e9da74b901f7ed1749ad697d77622ed0f9.tar.xz
linux-c088f4e9da74b901f7ed1749ad697d77622ed0f9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
-rw-r--r--sound/soc/davinci/davinci-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 74abc9b4f1cc..366049d8578c 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -212,7 +212,7 @@ davinci_pcm_pointer(struct snd_pcm_substream *substream)
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
count = src - runtime->dma_addr;
else
- count = dst - runtime->dma_addr;;
+ count = dst - runtime->dma_addr;
spin_unlock(&prtd->lock);