git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/snd-printk' into for-linus
[pandora-kernel.git]
/
sound
/
soc
/
fsl
/
mpc5200_psc_ac97.c
diff --git
a/sound/soc/fsl/mpc5200_psc_ac97.c
b/sound/soc/fsl/mpc5200_psc_ac97.c
index
7eb5499
..
c4ae3e0
100644
(file)
--- a/
sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/
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/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>
#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(®s->op1, MPC52xx_PSC_OP_RES);
udelay(10);
out_8(®s->op0, MPC52xx_PSC_OP_RES);
out_8(®s->op1, MPC52xx_PSC_OP_RES);
udelay(10);
out_8(®s->op0, MPC52xx_PSC_OP_RES);
-
udelay(50
);
+
msleep(1
);
psc_ac97_warm_reset(ac97);
}
psc_ac97_warm_reset(ac97);
}