summaryrefslogtreecommitdiff
path: root/packages/linux/linux-rp-2.6.19/wm9712-reset-loop-r2.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-12-06 01:18:28 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-12-06 01:18:28 +0000
commite6e55cb2f8f61adff5027c8a025f9c3fbf6f99a0 (patch)
treeb21450087917f2135e864f847bac087de8325fc8 /packages/linux/linux-rp-2.6.19/wm9712-reset-loop-r2.patch
parent84e2aa1a4f97429ee837fc59b7772bf7a2dfffd1 (diff)
linux-rp: Add w100 acceleration patch from sirfred. Add pcmcia card ID from pdaXrom user. Add 2.6.19 version
Diffstat (limited to 'packages/linux/linux-rp-2.6.19/wm9712-reset-loop-r2.patch')
-rw-r--r--packages/linux/linux-rp-2.6.19/wm9712-reset-loop-r2.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/packages/linux/linux-rp-2.6.19/wm9712-reset-loop-r2.patch b/packages/linux/linux-rp-2.6.19/wm9712-reset-loop-r2.patch
new file mode 100644
index 0000000000..78e81ea83a
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.19/wm9712-reset-loop-r2.patch
@@ -0,0 +1,44 @@
+ sound/soc/codecs/wm9712.c | 28 ++++++++++++++++++----------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+
+Index: git/sound/soc/codecs/wm9712.c
+===================================================================
+--- git.orig/sound/soc/codecs/wm9712.c 2006-11-07 22:10:01.000000000 +0000
++++ git/sound/soc/codecs/wm9712.c 2006-11-07 22:11:50.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;
+
+- soc_ac97_ops.reset(codec->ac97);
+- if (ac97_read(codec, 0) & 0x8000)
+- goto err;
+- return 0;
++ 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)
++ continue;
++ else
++ return 0;
++
++ }
+
+-err:
+ printk(KERN_ERR "WM9712 AC97 reset failed\n");
+ return -EIO;
+ }