diff options
| author | Takashi Iwai | 2016-02-29 17:23:50 +0100 |
|---|---|---|
| committer | Mark Brown | 2016-03-01 04:02:05 +0100 |
| commit | 127ee199d5d232f29ad64bace3b441127fce6cd3 (patch) | |
| tree | 20968fdc7dca9119e30675978970e058353be4da | |
| parent | ASoC: pxa: corgi: Fix enum ctl accesses in a wrong type (diff) | |
| download | kernel-qcow2-linux-127ee199d5d232f29ad64bace3b441127fce6cd3.tar.gz kernel-qcow2-linux-127ee199d5d232f29ad64bace3b441127fce6cd3.tar.xz kernel-qcow2-linux-127ee199d5d232f29ad64bace3b441127fce6cd3.zip | |
ASoC: pxa: magician: Fix enum ctl accesses in a wrong type
"Input Select" ctl in magician driver is an enum, while the current
driver accesses wrongly via value.integer.value[]. They have to be
via value.enumerated.item[] instead.
(Meanwhile "Headphone Switch" and "Speaker Switch" are boolean, so
they should stay to access via value.integer.value[] as is.)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/pxa/magician.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index 241d0be42d7a..62b8377a9d2b 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -308,17 +308,17 @@ static int magician_set_spk(struct snd_kcontrol *kcontrol, static int magician_get_input(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - ucontrol->value.integer.value[0] = magician_in_sel; + ucontrol->value.enumerated.item[0] = magician_in_sel; return 0; } static int magician_set_input(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - if (magician_in_sel == ucontrol->value.integer.value[0]) + if (magician_in_sel == ucontrol->value.enumerated.item[0]) return 0; - magician_in_sel = ucontrol->value.integer.value[0]; + magician_in_sel = ucontrol->value.enumerated.item[0]; switch (magician_in_sel) { case MAGICIAN_MIC: |