---

yaml --- r: 170107 b: refs/heads/master c: 88cdca9 h: refs/heads/master i: 170105: b51117c 170103: 855d45b v: v3
git-mirror · Nov 23, 2009 · 7907b88 · 7907b88
1 parent 7119d8d
commit 7907b88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 616ad593fe37ef265e5cb1282db6ca264197ffb2
+refs/heads/master: 88cdca9c7376f2220171d09dfc2f9e41b4834435
diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c
@@ -18,10 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/amba/bus.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/io.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -534,7 +531,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream)
 	struct aaci_runtime *aacirun = runtime->private_data;
 
 	aacirun->start	= (void *)runtime->dma_area;
-	aacirun->end	= aacirun->start + runtime->dma_bytes;
+	aacirun->end	= aacirun->start + snd_pcm_lib_buffer_bytes(substream);
 	aacirun->ptr	= aacirun->start;
 	aacirun->period	=
 	aacirun->bytes	= frames_to_bytes(runtime, runtime->period_size);