Commit 21a397c8 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ASoC: dapm: Fix ctl value accesses in a wrong type

commit 741338f9 upstream.

snd_soc_dapm_dai_link_get() and _put() access the associated ctl
values as value.integer.value[].  However, this is an enum ctl, and it
has to be accessed via value.enumerated.item[].  The former is long
while the latter is unsigned int, so they don't align.

Fixes: c6615082 ('ASoC: dapm: add code to configure dai link parameters')
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c92cc68
......@@ -3568,7 +3568,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;
}
......@@ -3582,13 +3582,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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment