From 7907b88bbb68941f95fb58a29537b586f54090d2 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 23 Nov 2009 09:44:10 +0100
Subject: [PATCH] --- yaml --- r: 170107 b: refs/heads/master c:
 88cdca9c7376f2220171d09dfc2f9e41b4834435 h: refs/heads/master i:   170105:
 b51117cc38377038025773659ed0877864ef6d33   170103:
 855d45b2cd1584ace801704104161c234dfc7a8f v: v3

---
 [refs]                 | 2 +-
 trunk/sound/arm/aaci.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e43fa2aebc57..ee0311c8dc28 100644
--- 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
index 1f0f8213e2d5..a03fe80a7a73 100644
--- 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);