[PATCH] [UBUNTU:sound/pci/ice1712/] Fix wrong value types for enums

[crimsun at fungus.sh.nu]

Subject: [PATCH] [UBUNTU:sound/pci/ice1712/] Fix wrong value types for enums

UpstreamStatus: Added in upstream pci/ice1712/aureon.c r1.31

Takashi Iwai committed this patch that fixes the wrong value types for
enum items.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/pci/ice1712/aureon.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

e96e83d71a7f43f457b190641e3dbeb61c5bcf4c
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 74c05c0..4e7bfd9 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -953,8 +953,8 @@ static int wm_adc_mux_get(snd_kcontrol_t
 
 	down(&ice->gpio_mutex);
 	val = wm_get(ice, WM_ADC_MUX);
-	ucontrol->value.integer.value[0] = val & 7;
-	ucontrol->value.integer.value[1] = (val >> 4) & 7;
+	ucontrol->value.enumerated.item[0] = val & 7;
+	ucontrol->value.enumerated.item[1] = (val >> 4) & 7;
 	up(&ice->gpio_mutex);
 	return 0;
 }
@@ -968,8 +968,8 @@ static int wm_adc_mux_put(snd_kcontrol_t
 	snd_ice1712_save_gpio_status(ice);
 	oval = wm_get(ice, WM_ADC_MUX);
 	nval = oval & ~0x77;
-	nval |= ucontrol->value.integer.value[0] & 7;
-	nval |= (ucontrol->value.integer.value[1] & 7) << 4;
+	nval |= ucontrol->value.enumerated.item[0] & 7;
+	nval |= (ucontrol->value.enumerated.item[1] & 7) << 4;
 	change = (oval != nval);
 	if (change)
 		wm_put(ice, WM_ADC_MUX, nval);
@@ -1009,7 +1009,7 @@ static int aureon_cs8415_mux_get(snd_kco
 
 	//snd_ice1712_save_gpio_status(ice);
 	//val = aureon_cs8415_get(ice, CS8415_CTRL2);
-	ucontrol->value.integer.value[0] = ice->spec.aureon.cs8415_mux;
+	ucontrol->value.enumerated.item[0] = ice->spec.aureon.cs8415_mux;
 	//snd_ice1712_restore_gpio_status(ice);
 	return 0;
 }
@@ -1023,12 +1023,12 @@ static int aureon_cs8415_mux_put(snd_kco
 	snd_ice1712_save_gpio_status(ice);
 	oval = aureon_cs8415_get(ice, CS8415_CTRL2);
 	nval = oval & ~0x07;
-	nval |= ucontrol->value.integer.value[0] & 7;
+	nval |= ucontrol->value.enumerated.item[0] & 7;
 	change = (oval != nval);
 	if (change)
 		aureon_cs8415_put(ice, CS8415_CTRL2, nval);
 	snd_ice1712_restore_gpio_status(ice);
-	ice->spec.aureon.cs8415_mux = ucontrol->value.integer.value[0];
+	ice->spec.aureon.cs8415_mux = ucontrol->value.enumerated.item[0];
 	return change;
 }
 
-- 
1.1.3


-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060413/d05c6e85/attachment.sig>