From 79cd57f3fac10bb14a669ab028153008c6295b82 Mon Sep 17 00:00:00 2001
From: Philby John <pjohn@mvista.com>
Date: Fri, 26 Mar 2010 21:37:51 +0530
Subject: [PATCH] --- yaml --- r: 189961 b: refs/heads/master c:
 b68b58fd6a341c2115ff5fb466fe9fc0b581980e h: refs/heads/master i:   189959:
 25124525c56c938bb3e9d19f6da80f5e4cb4aeda v: v3

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

diff --git a/[refs] b/[refs]
index 66cb66cf3590..eed44ac51982 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29aac005ff4dc8a5f50b80f4e5c4f59b21c0fb50
+refs/heads/master: b68b58fd6a341c2115ff5fb466fe9fc0b581980e
diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c
index 656e474dca47..91acc9a243ec 100644
--- a/trunk/sound/arm/aaci.c
+++ b/trunk/sound/arm/aaci.c
@@ -863,7 +863,6 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci)
 	struct snd_ac97 *ac97;
 	int ret;
 
-	writel(0, aaci->base + AC97_POWERDOWN);
 	/*
 	 * Assert AACIRESET for 2us
 	 */
@@ -1047,7 +1046,11 @@ static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)
 
 	writel(0x1fff, aaci->base + AACI_INTCLR);
 	writel(aaci->maincr, aaci->base + AACI_MAINCR);
-
+	/*
+	 * Fix: ac97 read back fail errors by reading
+	 * from any arbitrary aaci register.
+	 */
+	readl(aaci->base + AACI_CSCH1);
 	ret = aaci_probe_ac97(aaci);
 	if (ret)
 		goto out;