ASoC: da732x: Fix enum ctl accesses in a wrong type
Subsystems (3)
PATCH 1/1 ASoC: da732x: Fix enum ctl accesses in a wrong type
"DAC1 High Pass Filter Mode" & co in da732x codec driver are enum, while the current driver accesses wrongly via value.integer.value[]. They have to be via value.enumerated.item[] instead.
---
like other patchsets, I didn't put Cc to stable. If this driver is used for 64bit archs, feel free to put Cc to stable.
sound/soc/codecs/da732x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/da732x.c +4 -4
@@ -334,7 +334,7 @@ static int da732x_hpf_set(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;unsigned int reg = enum_ctrl->reg; -unsigned int sel = ucontrol->value.integer.value[0 ]; +unsigned int sel = ucontrol->value.enumerated.item[0 ];unsigned int bits;switch (sel) {
@@ -368,13 +368,13 @@ static int da732x_hpf_get(struct snd_kcontrol *kcontrol,switch (val) {case DA732X_HPF_VOICE_EN : - ucontrol->value.integer.value[0 ] =DA732X_HPF_VOICE ; + ucontrol->value.enumerated.item[0 ] =DA732X_HPF_VOICE ;break ;case DA732X_HPF_MUSIC_EN : - ucontrol->value.integer.value[0 ] =DA732X_HPF_MUSIC ; + ucontrol->value.enumerated.item[0 ] =DA732X_HPF_MUSIC ;break ;default : - ucontrol->value.integer.value[0 ] =DA732X_HPF_DISABLED ; + ucontrol->value.enumerated.item[0 ] =DA732X_HPF_DISABLED ;break ; }
Signature · 1 line
2.7.2
Mark Brown
maintainerApplied "ASoC: da732x: Fix enum ctl accesses in a wrong type" to the asoc tree
The patch
ASoC: da732x: Fix enum ctl accesses in a wrong type
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
fe9aba13108ee8e15ae59009a26db02460dbb04fMon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Mon, 29 Feb 2016 18:04:42 +0100
Subject: [PATCH] ASoC: da732x: Fix enum ctl accesses in a wrong type
"DAC1 High Pass Filter Mode" & co in da732x codec driver are enum, while the current driver accesses wrongly via value.integer.value[]. They have to be via value.enumerated.item[] instead.
--- sound/soc/codecs/da732x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/da732x.c +4 -4
@@ -334,7 +334,7 @@ static int da732x_hpf_set(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol);struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;unsigned int reg = enum_ctrl->reg; -unsigned int sel = ucontrol->value.integer.value[0 ]; +unsigned int sel = ucontrol->value.enumerated.item[0 ];unsigned int bits;switch (sel) {
@@ -368,13 +368,13 @@ static int da732x_hpf_get(struct snd_kcontrol *kcontrol,switch (val) {case DA732X_HPF_VOICE_EN : - ucontrol->value.integer.value[0 ] =DA732X_HPF_VOICE ; + ucontrol->value.enumerated.item[0 ] =DA732X_HPF_VOICE ;break ;case DA732X_HPF_MUSIC_EN : - ucontrol->value.integer.value[0 ] =DA732X_HPF_MUSIC ; + ucontrol->value.enumerated.item[0 ] =DA732X_HPF_MUSIC ;break ;default : - ucontrol->value.integer.value[0 ] =DA732X_HPF_DISABLED ; + ucontrol->value.enumerated.item[0 ] =DA732X_HPF_DISABLED ;break ; }
Signature · 1 line
2.7.0