Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 99115
b: refs/heads/master
c: abb68c2
h: refs/heads/master
i:
  99113: 764acc3
  99111: 8fdedf1
v: v3
  • Loading branch information
Mark Brown authored and Jaroslav Kysela committed Jun 16, 2008
1 parent 11cf10d commit 006b429
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aafc4412be31306e5c38bd4e4581066507503adc
refs/heads/master: abb68c26ba15f8e84e580a40c0b1bc349cb534b0
4 changes: 2 additions & 2 deletions trunk/sound/soc/codecs/wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions trunk/sound/soc/codecs/wm9713.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 006b429

Please sign in to comment.