From f737ca81ed68139fd2213668b671237e710ab1bc Mon Sep 17 00:00:00 2001
From: John Bonesio <bones@secretlab.ca>
Date: Tue, 21 Jul 2009 13:15:40 -0700
Subject: [PATCH] --- yaml --- r: 157586 b: refs/heads/master c:
 ed0f19b23754dc24f9a2d3c266a36277410f4686 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/sound/soc/fsl/mpc5200_psc_ac97.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d838e93c9150..d30b5d3ee72c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bca146578c863a1f37cb191995317e855a0364e1
+refs/heads/master: ed0f19b23754dc24f9a2d3c266a36277410f4686
diff --git a/trunk/sound/soc/fsl/mpc5200_psc_ac97.c b/trunk/sound/soc/fsl/mpc5200_psc_ac97.c
index 7eb549985d49..c4ae3e096bb9 100644
--- a/trunk/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/trunk/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/delay.h>
 
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -112,7 +113,7 @@ static void psc_ac97_cold_reset(struct snd_ac97 *ac97)
 	out_8(&regs->op1, MPC52xx_PSC_OP_RES);
 	udelay(10);
 	out_8(&regs->op0, MPC52xx_PSC_OP_RES);
-	udelay(50);
+	msleep(1);
 	psc_ac97_warm_reset(ac97);
 }