From af61822d161e57fe6a607e967d34743a90a8cbe5 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@mvista.com>
Date: Wed, 7 Feb 2007 05:41:37 +0100
Subject: [PATCH] --- yaml --- r: 48988 b: refs/heads/master c:
 62578cbfaa50df06b3bb6e4231adc3b911a3d4b4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3d49890edec9..de0bf941b61f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f69eda00d4e9808f0ddc88826278f93512cd2c98
+refs/heads/master: 62578cbfaa50df06b3bb6e4231adc3b911a3d4b4
diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c
index 53675cf4de44..b85df793cdce 100644
--- a/trunk/sound/arm/aaci.c
+++ b/trunk/sound/arm/aaci.c
@@ -164,10 +164,11 @@ static inline void aaci_chan_wait_ready(struct aaci_runtime *aacirun)
 /*
  * Interrupt support.
  */
-static void aaci_fifo_irq(struct aaci *aaci, u32 mask)
+static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)
 {
 	if (mask & ISR_URINTR) {
-		writel(ICLR_TXUEC1, aaci->base + AACI_INTCLR);
+		dev_dbg(&aaci->dev->dev, "TX underrun on chan %d\n", channel);
+		writel(ICLR_TXUEC1 << channel, aaci->base + AACI_INTCLR);
 	}
 
 	if (mask & ISR_TXINTR) {
@@ -233,7 +234,7 @@ static irqreturn_t aaci_irq(int irq, void *devid)
 		u32 m = mask;
 		for (i = 0; i < 4; i++, m >>= 7) {
 			if (m & 0x7f) {
-				aaci_fifo_irq(aaci, m);
+				aaci_fifo_irq(aaci, i, m);
 			}
 		}
 	}