diff options
| author | Charles Keepax | 2015-12-02 11:22:16 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-12-02 13:12:21 +0100 |
| commit | 20bb0184f24df64d1ed4fa07c8feeeffda9b7721 (patch) | |
| tree | c38be8ca54e8a0719ac7c8aa25eca270ef75b097 /sound/soc/soc-dapm.c | |
| parent | Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | kernel-qcow2-linux-20bb0184f24df64d1ed4fa07c8feeeffda9b7721.tar.gz kernel-qcow2-linux-20bb0184f24df64d1ed4fa07c8feeeffda9b7721.tar.xz kernel-qcow2-linux-20bb0184f24df64d1ed4fa07c8feeeffda9b7721.zip | |
ASoC: dapm: Make enable/disable_pin work with always on widgets
Always on widgets currently have some odd interactions with DAPM.
Enabling/disabling a widget (snd_soc_dapm_enable_pin) then connecting
it to a path works as expected, ie. when the widget is disabled the
path doesn't power up and it does when the widget is enabled. However
once in a path enabling the widget does not cause anything to power
up, dapm_widget_set_power will return the current power state of the
widget as 1, meaning we never check peer power states.
This patch updates dapm_always_on_check_power to return w->connected
such that it is effected by snd_soc_dapm_enable_pin and the like.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 6760044f6aae..4ecacdcba484 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1300,7 +1300,7 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) static int dapm_always_on_check_power(struct snd_soc_dapm_widget *w) { - return 1; + return w->connected; } static int dapm_seq_compare(struct snd_soc_dapm_widget *a, |