aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/wm9712.c4
-rw-r--r--sound/soc/codecs/wm9713.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 28ac66f6b6b2..47390113bd0e 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -589,12 +589,12 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
589{ 589{
590 if (try_warm && soc_ac97_ops.warm_reset) { 590 if (try_warm && soc_ac97_ops.warm_reset) {
591 soc_ac97_ops.warm_reset(codec->ac97); 591 soc_ac97_ops.warm_reset(codec->ac97);
592 if (!(ac97_read(codec, 0) & 0x8000)) 592 if (ac97_read(codec, 0) == wm9712_reg[0])
593 return 1; 593 return 1;
594 } 594 }
595 595
596 soc_ac97_ops.reset(codec->ac97); 596 soc_ac97_ops.reset(codec->ac97);
597 if (ac97_read(codec, 0) & 0x8000) 597 if (ac97_read(codec, 0) != wm9712_reg[0])
598 goto err; 598 goto err;
599 return 0; 599 return 0;
600 600
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index aba330118784..0db963747369 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1076,12 +1076,12 @@ int wm9713_reset(struct snd_soc_codec *codec, int try_warm)
1076{ 1076{
1077 if (try_warm && soc_ac97_ops.warm_reset) { 1077 if (try_warm && soc_ac97_ops.warm_reset) {
1078 soc_ac97_ops.warm_reset(codec->ac97); 1078 soc_ac97_ops.warm_reset(codec->ac97);
1079 if (!(ac97_read(codec, 0) & 0x8000)) 1079 if (ac97_read(codec, 0) == wm9713_reg[0])
1080 return 1; 1080 return 1;
1081 } 1081 }
1082 1082
1083 soc_ac97_ops.reset(codec->ac97); 1083 soc_ac97_ops.reset(codec->ac97);
1084 if (ac97_read(codec, 0) & 0x8000) 1084 if (ac97_read(codec, 0) != wm9713_reg[0])
1085 return -EIO; 1085 return -EIO;
1086 return 0; 1086 return 0;
1087} 1087}