diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-13 19:51:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-13 19:51:04 +0000 |
| commit | f98dedcefdbcbe8d51e77d911583ecc2c2668174 (patch) | |
| tree | 5bf81fe77322df0ca0c7e8c921302102f8700140 /sound/soc/soc-dapm.c | |
| parent | 905f6952c5bc8126f1d82c2eb8a699271080b57e (diff) | |
| parent | 3017358a75917b5ed5ad361c02ba2a7e257d3b2a (diff) | |
| download | linux-f98dedcefdbcbe8d51e77d911583ecc2c2668174.tar.gz linux-f98dedcefdbcbe8d51e77d911583ecc2c2668174.tar.bz2 linux-f98dedcefdbcbe8d51e77d911583ecc2c2668174.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index b30eda6cc960..1bd24d521508 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -712,7 +712,15 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) !path->connected(path->source, path->sink)) continue; - if (path->sink && path->sink->power_check && + if (!path->sink) + continue; + + if (path->sink->force) { + power = 1; + break; + } + + if (path->sink->power_check && path->sink->power_check(path->sink)) { power = 1; break; |