diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-23 03:44:10 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-23 03:44:10 -0500 |
commit | 88cdca9c7376f2220171d09dfc2f9e41b4834435 (patch) | |
tree | b3880929ddb42424a4debdd3bc32aeac8cb7b1fa /sound/arm/aaci.c | |
parent | 616ad593fe37ef265e5cb1282db6ca264197ffb2 (diff) |
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 1f0f8213e2d5..a03fe80a7a73 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
@@ -18,10 +18,7 @@ | |||
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/err.h> | 19 | #include <linux/err.h> |
20 | #include <linux/amba/bus.h> | 20 | #include <linux/amba/bus.h> |
21 | 21 | #include <linux/io.h> | |
22 | #include <asm/io.h> | ||
23 | #include <asm/irq.h> | ||
24 | #include <asm/sizes.h> | ||
25 | 22 | ||
26 | #include <sound/core.h> | 23 | #include <sound/core.h> |
27 | #include <sound/initval.h> | 24 | #include <sound/initval.h> |
@@ -534,7 +531,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream) | |||
534 | struct aaci_runtime *aacirun = runtime->private_data; | 531 | struct aaci_runtime *aacirun = runtime->private_data; |
535 | 532 | ||
536 | aacirun->start = (void *)runtime->dma_area; | 533 | aacirun->start = (void *)runtime->dma_area; |
537 | aacirun->end = aacirun->start + runtime->dma_bytes; | 534 | aacirun->end = aacirun->start + snd_pcm_lib_buffer_bytes(substream); |
538 | aacirun->ptr = aacirun->start; | 535 | aacirun->ptr = aacirun->start; |
539 | aacirun->period = | 536 | aacirun->period = |
540 | aacirun->bytes = frames_to_bytes(runtime, runtime->period_size); | 537 | aacirun->bytes = frames_to_bytes(runtime, runtime->period_size); |