Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283903
b: refs/heads/master
c: f1aac48
h: refs/heads/master
i:
  283901: e20d03b
  283899: 812377c
  283895: c8173cb
  283887: 30b45a0
  283871: c6580a3
  283839: 3ea7930
  283775: d4d3e39
  283647: 0f6bd03
v: v3
  • Loading branch information
Mark Brown committed Dec 8, 2011
1 parent 2095613 commit e1e6aed
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: beaff340e04fc3a752aa2cca70195dd506deccef
refs/heads/master: f1aac484f705007caf0d7c256a1a29506600cae3
7 changes: 7 additions & 0 deletions trunk/sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <linux/platform_device.h>
#include <linux/jiffies.h>
#include <linux/debugfs.h>
#include <linux/pm_runtime.h>
#include <linux/slab.h>
#include <sound/core.h>
#include <sound/pcm.h>
Expand Down Expand Up @@ -1206,6 +1207,9 @@ static void dapm_pre_sequence_async(void *data, async_cookie_t cookie)
/* If we're off and we're not supposed to be go into STANDBY */
if (d->bias_level == SND_SOC_BIAS_OFF &&
d->target_bias_level != SND_SOC_BIAS_OFF) {
if (d->dev)
pm_runtime_get_sync(d->dev);

ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_STANDBY);
if (ret != 0)
dev_err(d->dev,
Expand Down Expand Up @@ -1245,6 +1249,9 @@ static void dapm_post_sequence_async(void *data, async_cookie_t cookie)
ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_OFF);
if (ret != 0)
dev_err(d->dev, "Failed to turn off bias: %d\n", ret);

if (d->dev)
pm_runtime_put_sync(d->dev);
}

/* If we just powered up then move to active bias */
Expand Down

0 comments on commit e1e6aed

Please sign in to comment.