diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-02-07 11:04:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-07 11:04:48 +0100 |
| commit | cfd0d11ef565fef718118a3bd28afd52f8381bc9 (patch) | |
| tree | 6ce0b913b90757a12f9c635b5be4dcbfbfdfc663 /sound/soc/codecs/wm8994.c | |
| parent | eedec3d3854a390fc14008f265930f8c22b0373f (diff) | |
| parent | 43b6cec27e1e50a1de3eff47e66e502f3fe7e66e (diff) | |
| download | op-kernel-dev-cfd0d11ef565fef718118a3bd28afd52f8381bc9.zip op-kernel-dev-cfd0d11ef565fef718118a3bd28afd52f8381bc9.tar.gz | |
Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
The only particularly remarkable change here is the one for handling of
the Android suspend ignore code for idle_bias_off CODECs. That one is
actually a regression fix as some of the new power savings that have
been introduced confused the suspend ignore code, making devices that
are active for non-audio reasons look like they are idle causing them to
be suspended instead of being kept active.
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 93d27b6..8623950 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2753,11 +2753,6 @@ static int wm8994_resume(struct snd_soc_codec *codec) codec->cache_only = 0; } - /* Restore the registers */ - ret = snd_soc_cache_sync(codec); - if (ret != 0) - dev_err(codec->dev, "Failed to sync cache: %d\n", ret); - wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY); for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) { |
