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

Commit 1c750eb5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

parents fc77dbd3 741338f9

sound/soc/soc-dapm.c

+4 −4
Original line number Diff line number Diff line
@@ -3573,7 +3573,7 @@ static int snd_soc_dapm_dai_link_get(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol);



	ucontrol->value.integer.value[0] = w->params_select;

	ucontrol->value.enumerated.item[0] = w->params_select;



	return 0;

}
@@ -3587,13 +3587,13 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol, 
	if (w->power)

		return -EBUSY;



	if (ucontrol->value.integer.value[0] == w->params_select)

	if (ucontrol->value.enumerated.item[0] == w->params_select)

		return 0;



	if (ucontrol->value.integer.value[0] >= w->num_params)

	if (ucontrol->value.enumerated.item[0] >= w->num_params)

		return -EINVAL;



	w->params_select = ucontrol->value.integer.value[0];

	w->params_select = ucontrol->value.enumerated.item[0];



	return 0;

}