ASoC: wm_adsp: Fix enum ctl accesses in a wrong type
The firmware ctls like "DSP1 Firmware" in wm_adsp codec driver are enum, while the current driver accesses wrongly via value.integer.value[]. They have to be via value.enumerated.item[] instead. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
This commit is contained in:
Родитель
92e963f50f
Коммит
15c665700b
|
@ -586,7 +586,7 @@ static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,
|
|||
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
|
||||
struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec);
|
||||
|
||||
ucontrol->value.integer.value[0] = dsp[e->shift_l].fw;
|
||||
ucontrol->value.enumerated.item[0] = dsp[e->shift_l].fw;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -599,10 +599,10 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
|
|||
struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec);
|
||||
int ret = 0;
|
||||
|
||||
if (ucontrol->value.integer.value[0] == dsp[e->shift_l].fw)
|
||||
if (ucontrol->value.enumerated.item[0] == dsp[e->shift_l].fw)
|
||||
return 0;
|
||||
|
||||
if (ucontrol->value.integer.value[0] >= WM_ADSP_NUM_FW)
|
||||
if (ucontrol->value.enumerated.item[0] >= WM_ADSP_NUM_FW)
|
||||
return -EINVAL;
|
||||
|
||||
mutex_lock(&dsp[e->shift_l].pwr_lock);
|
||||
|
@ -610,7 +610,7 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
|
|||
if (dsp[e->shift_l].running || dsp[e->shift_l].compr)
|
||||
ret = -EBUSY;
|
||||
else
|
||||
dsp[e->shift_l].fw = ucontrol->value.integer.value[0];
|
||||
dsp[e->shift_l].fw = ucontrol->value.enumerated.item[0];
|
||||
|
||||
mutex_unlock(&dsp[e->shift_l].pwr_lock);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче