ASoC: Ensure all DAPM widgets are instantiated with the card
PATCH 1/2 ASoC: Ensure all DAPM widgets are instantiated with the card
Specifically for the widgets added by machine driver late probe functions.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +2 -0
@@ -1478,6 +1478,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) } } +snd_soc_dapm_new_widgets (&card->dapm); + ret =snd_card_register (card->snd_card);if (ret <0 ) {printk (KERN_ERR "asoc: failed to register soundcard for %s\n" , card->name);
Signature · 1 line
1.7.6.3
PATCH 2/2 ASoC: Assign power_check when we allocate DAPM widgets
This ensures none of the rest of the code ever encounters a widget which does not have a power check function.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-dapm.c | 67 +++++++++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 28 deletions(-)
sound/soc/soc-dapm.c +39 -28
@@ -2138,48 +2138,21 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)case snd_soc_dapm_switch:case snd_soc_dapm_mixer:case snd_soc_dapm_mixer_named_ctl: - w->power_check = dapm_generic_check_power;dapm_new_mixer (w);break ;case snd_soc_dapm_mux:case snd_soc_dapm_virt_mux:case snd_soc_dapm_value_mux: - w->power_check = dapm_generic_check_power;dapm_new_mux (w);break ; -case snd_soc_dapm_adc: -case snd_soc_dapm_aif_out: - w->power_check = dapm_adc_check_power; -break ; -case snd_soc_dapm_dac: -case snd_soc_dapm_aif_in: - w->power_check = dapm_dac_check_power; -break ;case snd_soc_dapm_pga:case snd_soc_dapm_out_drv: - w->power_check = dapm_generic_check_power;dapm_new_pga (w);break ; -case snd_soc_dapm_input: -case snd_soc_dapm_output: -case snd_soc_dapm_micbias: -case snd_soc_dapm_spk: -case snd_soc_dapm_hp: -case snd_soc_dapm_mic: -case snd_soc_dapm_line: - w->power_check = dapm_generic_check_power; -break ; -case snd_soc_dapm_supply: - w->power_check = dapm_supply_check_power; -case snd_soc_dapm_vmid: -case snd_soc_dapm_pre: -case snd_soc_dapm_post: +default :break ; } -if (!w->power_check) - w->power_check = dapm_always_on_check_power; -/* Read the initial power state from the device */ if (w->reg >=0 ) { val =soc_widget_read (w, w->reg);
@@ -2668,6 +2641,44 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,else snprintf (w->name, name_len,"%s" , widget->name); +switch (w->id) { +case snd_soc_dapm_switch: +case snd_soc_dapm_mixer: +case snd_soc_dapm_mixer_named_ctl: + w->power_check = dapm_generic_check_power; +break ; +case snd_soc_dapm_mux: +case snd_soc_dapm_virt_mux: +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: + w->power_check = dapm_adc_check_power; +break ; +case snd_soc_dapm_dac: +case snd_soc_dapm_aif_in: + w->power_check = dapm_dac_check_power; +break ; +case snd_soc_dapm_pga: +case snd_soc_dapm_out_drv: +case snd_soc_dapm_input: +case snd_soc_dapm_output: +case snd_soc_dapm_micbias: +case snd_soc_dapm_spk: +case snd_soc_dapm_hp: +case snd_soc_dapm_mic: +case snd_soc_dapm_line: + w->power_check = dapm_generic_check_power; +break ; +case snd_soc_dapm_supply: + w->power_check = dapm_supply_check_power; +break ; +default : + w->power_check = dapm_always_on_check_power; +break ; + } + dapm->n_widgets++; w->dapm = dapm; w->codec = dapm->codec;
Signature · 1 line
1.7.6.3