diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-02-13 12:05:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-13 12:05:30 +0100 |
| commit | 374a69e76effdb84ef068d63759d8f990710432f (patch) | |
| tree | 3dc7c85a7c80e763b4cc45e067ef50f2cff9c76a /sound/soc/soc-core.c | |
| parent | 8bc039a1e15a72da8426b84293723fb7181f0b5e (diff) | |
| parent | a1e0c3cf7fb07227fe1f26161d969101dba78287 (diff) | |
| download | op-kernel-dev-374a69e76effdb84ef068d63759d8f990710432f.zip op-kernel-dev-374a69e76effdb84ef068d63759d8f990710432f.tar.gz | |
Merge branch 'fix/hda' into topic/hda
Necessary for working on the jack-detection suppression feature.
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 b5ecf6d..92cee24 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; |
