From b6b3eb6aa1d89c42eee766af439159b97e8323ca Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 14 May 2009 20:52:46 +0100 Subject: [PATCH] --- yaml --- r: 148277 b: refs/heads/master c: 63c26baa2aa624b023892d66ed696525fc787560 h: refs/heads/master i: 148275: 571cb26d21ddc9ac98735b3047fe6963acf33749 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm9712.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3a3ee2bb4001..f3fce52f3f5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c13cb78ace34ef9e4cfa2a2fae9a7772d90d6ace +refs/heads/master: 63c26baa2aa624b023892d66ed696525fc787560 diff --git a/trunk/sound/soc/codecs/wm9712.c b/trunk/sound/soc/codecs/wm9712.c index 550c903f23bf..1fd4e88f50cf 100644 --- a/trunk/sound/soc/codecs/wm9712.c +++ b/trunk/sound/soc/codecs/wm9712.c @@ -585,6 +585,8 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) } soc_ac97_ops.reset(codec->ac97); + if (soc_ac97_ops.warm_reset) + soc_ac97_ops.warm_reset(codec->ac97); if (ac97_read(codec, 0) != wm9712_reg[0]) goto err; return 0;