3.2.69-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Takashi Iwai <[email protected]> commit 00a14c2968e3d55817e0fa35c78106ca840537bf upstream. The correct values referred by a boolean control are value.integer.value[], not value.enumerated.item[]. The former is long while the latter is int, so it's even incompatible on 64bit architectures. Signed-off-by: Takashi Iwai <[email protected]> Acked-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <[email protected]> --- sound/soc/codecs/wm2000.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -614,7 +614,7 @@ static int wm2000_anc_mode_get(struct sn { struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev); - ucontrol->value.enumerated.item[0] = wm2000->anc_active; + ucontrol->value.integer.value[0] = wm2000->anc_active; return 0; } @@ -623,7 +623,7 @@ static int wm2000_anc_mode_put(struct sn struct snd_ctl_elem_value *ucontrol) { struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev); - int anc_active = ucontrol->value.enumerated.item[0]; + int anc_active = ucontrol->value.integer.value[0]; if (anc_active > 1) return -EINVAL; @@ -638,7 +638,7 @@ static int wm2000_speaker_get(struct snd { struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev); - ucontrol->value.enumerated.item[0] = wm2000->spk_ena; + ucontrol->value.integer.value[0] = wm2000->spk_ena; return 0; } @@ -647,7 +647,7 @@ static int wm2000_speaker_put(struct snd struct snd_ctl_elem_value *ucontrol) { struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev); - int val = ucontrol->value.enumerated.item[0]; + int val = ucontrol->value.integer.value[0]; if (val > 1) return -EINVAL; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
