diff options
| author | Mark Brown <broonie@kernel.org> | 2015-12-01 19:14:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-01 19:14:13 +0100 |
| commit | f299eccc0ff0d8bdab7b5f0858bcc59e1d3a731f (patch) | |
| tree | f99f10b660b29bbf1493d6747e2f515bfeea805f /sound/soc/soc-dapm.c | |
| parent | ASoC: core: mark SND_SOC_BYTES_EXT as deprecated (diff) | |
| parent | ASoC: dapm: add a dapm sink widget (diff) | |
| download | linux-f299eccc0ff0d8bdab7b5f0858bcc59e1d3a731f.tar.xz linux-f299eccc0ff0d8bdab7b5f0858bcc59e1d3a731f.zip | |
Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 016eba10b1ec..6760044f6aae 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3351,6 +3351,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: |