diff options
| author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:32 +0000 |
| commit | 3b88210da3a6af69e8bc7a6237e72c6ef5a2ca45 (patch) | |
| tree | 98554d8d3f74c7444871d9461d3c1a46c23ce158 /sound/soc/soc-dapm.c | |
| parent | 6b8bd8b2d7937fc633725c252c3a9ed9fff47098 (diff) | |
| parent | 20bb0184f24df64d1ed4fa07c8feeeffda9b7721 (diff) | |
| download | talos-obmc-linux-3b88210da3a6af69e8bc7a6237e72c6ef5a2ca45.tar.gz talos-obmc-linux-3b88210da3a6af69e8bc7a6237e72c6ef5a2ca45.zip | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7d009428934a..8130b63e7f14 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, @@ -3358,6 +3358,11 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, w->is_ep = SND_SOC_DAPM_EP_SOURCE; w->power_check = dapm_always_on_check_power; break; + case snd_soc_dapm_sink: + w->is_ep = SND_SOC_DAPM_EP_SINK; + w->power_check = dapm_always_on_check_power; + break; + case snd_soc_dapm_mux: case snd_soc_dapm_demux: case snd_soc_dapm_switch: |
