浏览代码

ALSA: ASoC: Check for exact register match in wm97xx_reset()

To provide added robustness in case an AC97 controller reads back all
zeros in error cases check for an exact match when testing to see if
resets have brought the codec back.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Mark Brown 17 年之前
父节点
当前提交
abb68c26ba
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      sound/soc/codecs/wm9712.c
  2. 2 2
      sound/soc/codecs/wm9713.c

+ 2 - 2
sound/soc/codecs/wm9712.c

@@ -589,12 +589,12 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
 {
 {
 	if (try_warm && soc_ac97_ops.warm_reset) {
 	if (try_warm && soc_ac97_ops.warm_reset) {
 		soc_ac97_ops.warm_reset(codec->ac97);
 		soc_ac97_ops.warm_reset(codec->ac97);
-		if (!(ac97_read(codec, 0) & 0x8000))
+		if (ac97_read(codec, 0) == wm9712_reg[0])
 			return 1;
 			return 1;
 	}
 	}
 
 
 	soc_ac97_ops.reset(codec->ac97);
 	soc_ac97_ops.reset(codec->ac97);
-	if (ac97_read(codec, 0) & 0x8000)
+	if (ac97_read(codec, 0) != wm9712_reg[0])
 		goto err;
 		goto err;
 	return 0;
 	return 0;
 
 

+ 2 - 2
sound/soc/codecs/wm9713.c

@@ -1076,12 +1076,12 @@ int wm9713_reset(struct snd_soc_codec *codec, int try_warm)
 {
 {
 	if (try_warm && soc_ac97_ops.warm_reset) {
 	if (try_warm && soc_ac97_ops.warm_reset) {
 		soc_ac97_ops.warm_reset(codec->ac97);
 		soc_ac97_ops.warm_reset(codec->ac97);
-		if (!(ac97_read(codec, 0) & 0x8000))
+		if (ac97_read(codec, 0) == wm9713_reg[0])
 			return 1;
 			return 1;
 	}
 	}
 
 
 	soc_ac97_ops.reset(codec->ac97);
 	soc_ac97_ops.reset(codec->ac97);
-	if (ac97_read(codec, 0) & 0x8000)
+	if (ac97_read(codec, 0) != wm9713_reg[0])
 		return -EIO;
 		return -EIO;
 	return 0;
 	return 0;
 }
 }