From 006b429ad0d8378c3f9dff0f4a94693a0353f296 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 13 Jun 2008 16:24:04 +0100 Subject: [PATCH] --- yaml --- r: 99115 b: refs/heads/master c: abb68c26ba15f8e84e580a40c0b1bc349cb534b0 h: refs/heads/master i: 99113: 764acc336ed4eebadc213c47e121cfbc12bf5062 99111: 8fdedf1422ea405a7209c5f5db160a27a4d4baf7 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm9712.c | 4 ++-- trunk/sound/soc/codecs/wm9713.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5a7356d31378..96be5ad1e36f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aafc4412be31306e5c38bd4e4581066507503adc +refs/heads/master: abb68c26ba15f8e84e580a40c0b1bc349cb534b0 diff --git a/trunk/sound/soc/codecs/wm9712.c b/trunk/sound/soc/codecs/wm9712.c index 28ac66f6b6b2..47390113bd0e 100644 --- a/trunk/sound/soc/codecs/wm9712.c +++ b/trunk/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/trunk/sound/soc/codecs/wm9713.c b/trunk/sound/soc/codecs/wm9713.c index aba330118784..0db963747369 100644 --- a/trunk/sound/soc/codecs/wm9713.c +++ b/trunk/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; }