linux-rp-2.6.17: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2013 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-06-26 21:36:34 +00:00
parent d3076aca9d
commit 8689ce9ada
6 changed files with 31939 additions and 8 deletions

View File

@@ -0,0 +1,44 @@
sound/soc/codecs/wm9712.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
Index: linux-2.6.18/sound/soc/codecs/wm9712.c
===================================================================
--- linux-2.6.18.orig/sound/soc/codecs/wm9712.c 2006-12-05 23:25:33.000000000 +0000
+++ linux-2.6.18/sound/soc/codecs/wm9712.c 2006-12-05 23:27:20.000000000 +0000
@@ -618,18 +618,26 @@ static int wm9712_dapm_event(struct snd_
static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
{
- if (try_warm && soc_ac97_ops.warm_reset) {
- soc_ac97_ops.warm_reset(codec->ac97);
- if (!(ac97_read(codec, 0) & 0x8000))
- return 1;
- }
+ int retry = 3;
+
+ while (retry--)
+ {
+ if(try_warm && soc_ac97_ops.warm_reset) {
+ soc_ac97_ops.warm_reset(codec->ac97);
+ if(ac97_read(codec, 0) & 0x8000)
+ continue;
+ else
+ return 1;
+ }
- soc_ac97_ops.reset(codec->ac97);
- if (ac97_read(codec, 0) & 0x8000)
- goto err;
- return 0;
+ soc_ac97_ops.reset(codec->ac97);
+ if(ac97_read(codec, 0) & 0x8000)
+ continue;
+ else
+ return 0;
+
+ }
-err:
printk(KERN_ERR "WM9712 AC97 reset failed\n");
return -EIO;
}