From 10141076775b5c03a045ca2a564bbe5cbc28e5d6 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 1 Nov 2011 13:36:10 +0000 Subject: [PATCH] --- yaml --- r: 273572 b: refs/heads/master c: 4f4488abc97c1c27ff029f887944e6a6da1f5733 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8962.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57bc991c3070..69fa0ba0c264 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64964e82644e9f809dc83019186c21ed5b70aa56 +refs/heads/master: 4f4488abc97c1c27ff029f887944e6a6da1f5733 diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c index f60dfa16545e..32d931f1122c 100644 --- a/trunk/sound/soc/codecs/wm8962.c +++ b/trunk/sound/soc/codecs/wm8962.c @@ -1961,7 +1961,13 @@ static int wm8962_readable_register(struct snd_soc_codec *codec, unsigned int re static int wm8962_reset(struct snd_soc_codec *codec) { - return snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243); + int ret; + + ret = snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243); + if (ret != 0) + return ret; + + return snd_soc_write(codec, WM8962_PLL_SOFTWARE_RESET, 0); } static const DECLARE_TLV_DB_SCALE(inpga_tlv, -2325, 75, 0);