---

yaml --- r: 189961 b: refs/heads/master c: b68b58f h: refs/heads/master i: 189959: 2512452 v: v3
git-mirror · Apr 13, 2010 · 79cd57f · 79cd57f
1 parent f056702
commit 79cd57f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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;