diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-06-13 16:24:04 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-06-16 09:32:27 +0200 |
| commit | abb68c26ba15f8e84e580a40c0b1bc349cb534b0 (patch) | |
| tree | 25afa44a648a8e11cd26a657d694eacc345075df /sound/soc | |
| parent | aafc4412be31306e5c38bd4e4581066507503adc (diff) | |
| download | op-kernel-dev-abb68c26ba15f8e84e580a40c0b1bc349cb534b0.zip op-kernel-dev-abb68c26ba15f8e84e580a40c0b1bc349cb534b0.tar.gz | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm9712.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/wm9713.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 28ac66f..4739011 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) { if (try_warm && soc_ac97_ops.warm_reset) { soc_ac97_ops.warm_reset(codec->ac97); - if (!(ac97_read(codec, 0) & 0x8000)) + if (ac97_read(codec, 0) == wm9712_reg[0]) return 1; } soc_ac97_ops.reset(codec->ac97); - if (ac97_read(codec, 0) & 0x8000) + if (ac97_read(codec, 0) != wm9712_reg[0]) goto err; return 0; diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index aba3301..0db9637 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) { if (try_warm && soc_ac97_ops.warm_reset) { soc_ac97_ops.warm_reset(codec->ac97); - if (!(ac97_read(codec, 0) & 0x8000)) + if (ac97_read(codec, 0) == wm9713_reg[0]) return 1; } soc_ac97_ops.reset(codec->ac97); - if (ac97_read(codec, 0) & 0x8000) + if (ac97_read(codec, 0) != wm9713_reg[0]) return -EIO; return 0; } |
