diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-18 13:50:04 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-18 13:50:04 +0000 |
| commit | a29979e19ed76c2029cfd822951b7fde56a98a8e (patch) | |
| tree | 85102cf43b72d5ce2294ab17f565183b4436729d /packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch | |
| parent | 16b15891b993ca44dacd6c15ec678b2eac721548 (diff) | |
| parent | 302f1878f6adacd506a24dd55fecc262a57bf61e (diff) | |
merge of '1d2340f5c0766711d217ca40fbfcb4cb196412ac'
and '8bee8c12a8f566036b80dc740f5215782a19eb8b'
Diffstat (limited to 'packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch')
| -rw-r--r-- | packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch b/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch new file mode 100644 index 0000000000..78e81ea83a --- /dev/null +++ b/packages/linux/linux-rp-2.6.19+git/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; + } |