diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-18 22:03:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-24 14:56:15 +0100 |
| commit | 63c69a6e4134a2085d40e40c02a395dd1bd8c023 (patch) | |
| tree | ab724620b7b901129cf0f3d2e1fbba785ce7865a /sound/soc/soc-dapm.c | |
| parent | 56a678344273fd63f8ade26876283a2586a9bf3a (diff) | |
| download | op-kernel-dev-63c69a6e4134a2085d40e40c02a395dd1bd8c023.zip op-kernel-dev-63c69a6e4134a2085d40e40c02a395dd1bd8c023.tar.gz | |
ASoC: dapm: Use generic power check for everything except DAIs
As noticed by Lars-Peter Clausen since the move to using widgets to hook
into the DAIs we no longer directly manage the power of AIF or DAC/ADC
widgets from the stream integration so they can just use the generic power
checks instead of the custom stream integration ones they currently do.
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index bd16010..3786558 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3126,16 +3126,16 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, case snd_soc_dapm_value_mux: w->power_check = dapm_generic_check_power; break; - case snd_soc_dapm_adc: - case snd_soc_dapm_aif_out: case snd_soc_dapm_dai_out: w->power_check = dapm_adc_check_power; break; - case snd_soc_dapm_dac: - case snd_soc_dapm_aif_in: case snd_soc_dapm_dai_in: w->power_check = dapm_dac_check_power; break; + case snd_soc_dapm_adc: + case snd_soc_dapm_aif_out: + case snd_soc_dapm_dac: + case snd_soc_dapm_aif_in: case snd_soc_dapm_pga: case snd_soc_dapm_out_drv: case snd_soc_dapm_input: |
