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

Commit 0d911262 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 9b876c99 a5d5639f

include/sound/soc-dapm.h

+3 −0
Original line number Diff line number Diff line
@@ -382,6 +382,9 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, 
int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,

	const struct snd_soc_dapm_widget *widget,

	int num);

struct snd_soc_dapm_widget *snd_soc_dapm_new_control(

		struct snd_soc_dapm_context *dapm,

		const struct snd_soc_dapm_widget *widget);

int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,

				 struct snd_soc_dai *dai);

int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);

sound/soc/soc-dapm.c

+1 −0
Original line number Diff line number Diff line
@@ -3282,6 +3282,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, 
	mutex_unlock(&dapm->card->dapm_mutex);

	return w;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);



struct snd_soc_dapm_widget *

snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,