summaryrefslogtreecommitdiff
path: root/packages/linux/linux-rp-2.6.24/tosa/0053-sound-soc-codecs-wm9712.c-28.patch
blob: 0675342508f9515df19d1e8aa1b6fc98644d6182 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
From 47616d22f8f303dfd66cf3b9125af212194a0f3c Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Wed, 9 Jan 2008 02:08:17 +0300
Subject: [PATCH 53/64]  sound/soc/codecs/wm9712.c |   28 ++++++++++++++++++----------
  1 file changed, 18 insertions(+), 10 deletions(-)

Index: git/sound/soc/codecs/wm9712.c
===================================================================
---
 sound/soc/codecs/wm9712.c |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 986b5d5..dfb31e1 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -606,18 +606,26 @@ static int wm9712_dapm_event(struct snd_soc_codec *codec, int event)
 
 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;
 }
-- 
1.5.3.8