diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 10:45:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 10:45:07 +0100 |
| commit | 15d47763b354256053c390a9b7bc9f2b4f197711 (patch) | |
| tree | 6f516e0d3a3d5fb0174d06dfd6db268f4eb5b8ed /sound/soc/soc-dapm.c | |
| parent | 0ff97ebf0804d2e519d578fcb4db03f104d2ca8c (diff) | |
| parent | d66a547cddb9124cea6308c33e1f54c7c8db288f (diff) | |
| download | linux-15d47763b354256053c390a9b7bc9f2b4f197711.tar.gz linux-15d47763b354256053c390a9b7bc9f2b4f197711.tar.bz2 linux-15d47763b354256053c390a9b7bc9f2b4f197711.zip | |
Merge branch 'for-3.5' into for-3.6
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 025060b26fb7..4d181df95dc3 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -291,9 +291,9 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm, if (dapm->codec->driver->set_bias_level) ret = dapm->codec->driver->set_bias_level(dapm->codec, level); - else - dapm->bias_level = level; - } + } else + dapm->bias_level = level; + if (ret != 0) goto out; @@ -324,11 +324,10 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, val = soc_widget_read(w, reg); val = (val >> shift) & mask; + if (invert) + val = max - val; - if ((invert && !val) || (!invert && val)) - p->connect = 1; - else - p->connect = 0; + p->connect = !!val; } break; case snd_soc_dapm_mux: { @@ -3668,10 +3667,13 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_free); static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm) { + struct snd_soc_card *card = dapm->card; struct snd_soc_dapm_widget *w; LIST_HEAD(down_list); int powerdown = 0; + mutex_lock(&card->dapm_mutex); + list_for_each_entry(w, &dapm->card->widgets, list) { if (w->dapm != dapm) continue; @@ -3694,6 +3696,8 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm) snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_STANDBY); } + + mutex_unlock(&card->dapm_mutex); } /* |