Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64fdf13c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

parents 97c53e26 5dc0158a

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

				const char *pin);

void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card);

unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);



/* Mostly internal - should not normally be used */

void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);

sound/soc/soc-dapm.c

+2 −1
Original line number Diff line number Diff line
@@ -326,12 +326,13 @@ static struct list_head *dapm_kcontrol_get_path_list( 
	list_for_each_entry(path, dapm_kcontrol_get_path_list(kcontrol), \

		list_kcontrol)



static unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol)

unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol)

{

	struct dapm_kcontrol_data *data = snd_kcontrol_chip(kcontrol);



	return data->value;

}

EXPORT_SYMBOL_GPL(dapm_kcontrol_get_value);



static bool dapm_kcontrol_set_value(const struct snd_kcontrol *kcontrol,

	unsigned int value)