diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 11:26:27 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 11:26:27 -0400 |
commit | ddfb43f3881edb47aa0083651ad31983cdc42c33 (patch) | |
tree | 7128cb13b599d2903a4deb05bbae37508b1c261e /sound/soc/soc-dapm.c | |
parent | 2d6d649a2e0fa0268c0d03d5b1d330ca7907d33c (diff) | |
parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) |
Merge tag 'v3.6-rc6' into for-3.7
Linux 3.6-rc6 has all our bug fixes.
Conflicts (trivial overlap):
sound/soc/omap/am3517evm.c
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r-- | sound/soc/soc-dapm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a18d115bc507..873e6e76ee87 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -313,8 +313,11 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm, | |||
313 | if (dapm->codec->driver->set_bias_level) | 313 | if (dapm->codec->driver->set_bias_level) |
314 | ret = dapm->codec->driver->set_bias_level(dapm->codec, | 314 | ret = dapm->codec->driver->set_bias_level(dapm->codec, |
315 | level); | 315 | level); |
316 | } else | 316 | else |
317 | dapm->bias_level = level; | ||
318 | } else if (!card || dapm != &card->dapm) { | ||
317 | dapm->bias_level = level; | 319 | dapm->bias_level = level; |
320 | } | ||
318 | 321 | ||
319 | if (ret != 0) | 322 | if (ret != 0) |
320 | goto out; | 323 | goto out; |