diff options
| author | Mark Brown | 2012-02-09 13:00:22 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-02-09 13:00:22 +0100 |
| commit | a08a499aa3d85b605b5669cfc82b8e14232f7e91 (patch) | |
| tree | fd82da95552c996e9522a068ec77eae3a5ac6eec /sound/soc/soc-core.c | |
| parent | Merge branch 'topic/pcm-internal' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Linux 3.3-rc3 (diff) | |
| download | kernel-qcow2-linux-a08a499aa3d85b605b5669cfc82b8e14232f7e91.tar.gz kernel-qcow2-linux-a08a499aa3d85b605b5669cfc82b8e14232f7e91.tar.xz kernel-qcow2-linux-a08a499aa3d85b605b5669cfc82b8e14232f7e91.zip | |
Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development.
Linux 3.3-rc3
.. the number of the half-beast?
Conflicts:
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 32dbcda5cb22..8bd999530a76 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -567,6 +567,17 @@ int snd_soc_suspend(struct device *dev) if (!codec->suspended && codec->driver->suspend) { switch (codec->dapm.bias_level) { case SND_SOC_BIAS_STANDBY: + /* + * If the CODEC is capable of idle + * bias off then being in STANDBY + * means it's doing something, + * otherwise fall through. + */ + if (codec->dapm.idle_bias_off) { + dev_dbg(codec->dev, + "idle_bias_off CODEC on over suspend\n"); + break; + } case SND_SOC_BIAS_OFF: codec->driver->suspend(codec); codec->suspended = 1; |