Browse Source

ALSA: AACI cleanup

Fix the buffer size calculation to use the size which ALSA is expecting.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Russell King 15 years ago
parent
commit
88cdca9c73
1 changed files with 2 additions and 5 deletions
  1. 2 5
      sound/arm/aaci.c

+ 2 - 5
sound/arm/aaci.c

@@ -18,10 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/err.h>
 #include <linux/amba/bus.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/core.h>
 #include <sound/initval.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;
 	struct aaci_runtime *aacirun = runtime->private_data;
 
 
 	aacirun->start	= (void *)runtime->dma_area;
 	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->ptr	= aacirun->start;
 	aacirun->period	=
 	aacirun->period	=
 	aacirun->bytes	= frames_to_bytes(runtime, runtime->period_size);
 	aacirun->bytes	= frames_to_bytes(runtime, runtime->period_size);