diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-23 09:44:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-23 09:44:10 +0100 |
| commit | 88cdca9c7376f2220171d09dfc2f9e41b4834435 (patch) | |
| tree | b3880929ddb42424a4debdd3bc32aeac8cb7b1fa /sound/arm/aaci.c | |
| parent | 616ad593fe37ef265e5cb1282db6ca264197ffb2 (diff) | |
| download | linux-3.10-88cdca9c7376f2220171d09dfc2f9e41b4834435.tar.gz linux-3.10-88cdca9c7376f2220171d09dfc2f9e41b4834435.tar.bz2 linux-3.10-88cdca9c7376f2220171d09dfc2f9e41b4834435.zip | |
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>
Diffstat (limited to 'sound/arm/aaci.c')
| -rw-r--r-- | sound/arm/aaci.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 1f0f8213e2d..a03fe80a7a7 100644 --- a/sound/arm/aaci.c +++ b/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); |