Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus (2022d24e) · Commits · 戴 / test

sound/soc/soc-dapm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -310,7 +310,7 @@ struct dapm_kcontrol_data {
		};

		static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
		struct snd_kcontrol *kcontrol)
		struct snd_kcontrol kcontrol, const char ctrl_name)
		{
		struct dapm_kcontrol_data *data;
		struct soc_mixer_control *mc;
		@@ -333,7 +333,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
		if (mc->autodisable) {
		struct snd_soc_dapm_widget template;

		name = kasprintf(GFP_KERNEL, "%s %s", kcontrol->id.name,
		name = kasprintf(GFP_KERNEL, "%s %s", ctrl_name,
		"Autodisable");
		if (!name) {
		ret = -ENOMEM;
		@@ -371,7 +371,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
		if (e->autodisable) {
		struct snd_soc_dapm_widget template;

		name = kasprintf(GFP_KERNEL, "%s %s", kcontrol->id.name,
		name = kasprintf(GFP_KERNEL, "%s %s", ctrl_name,
		"Autodisable");
		if (!name) {
		ret = -ENOMEM;
		@@ -871,7 +871,7 @@ static int dapm_create_or_share_kcontrol(struct snd_soc_dapm_widget *w,

		kcontrol->private_free = dapm_kcontrol_free;

		ret = dapm_kcontrol_data_alloc(w, kcontrol);
		ret = dapm_kcontrol_data_alloc(w, kcontrol, name);
		if (ret) {
		snd_ctl_free_one(kcontrol);
		goto exit_free;