diff options
| -rw-r--r-- | sound/soc/omap/rx51.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 5e21f08579d8..54949242bc70 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c | |||
| @@ -132,7 +132,7 @@ static struct snd_soc_ops rx51_ops = { | |||
| 132 | static int rx51_get_spk(struct snd_kcontrol *kcontrol, | 132 | static int rx51_get_spk(struct snd_kcontrol *kcontrol, |
| 133 | struct snd_ctl_elem_value *ucontrol) | 133 | struct snd_ctl_elem_value *ucontrol) |
| 134 | { | 134 | { |
| 135 | ucontrol->value.integer.value[0] = rx51_spk_func; | 135 | ucontrol->value.enumerated.item[0] = rx51_spk_func; |
| 136 | 136 | ||
| 137 | return 0; | 137 | return 0; |
| 138 | } | 138 | } |
| @@ -142,10 +142,10 @@ static int rx51_set_spk(struct snd_kcontrol *kcontrol, | |||
| 142 | { | 142 | { |
| 143 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); | 143 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); |
| 144 | 144 | ||
| 145 | if (rx51_spk_func == ucontrol->value.integer.value[0]) | 145 | if (rx51_spk_func == ucontrol->value.enumerated.item[0]) |
| 146 | return 0; | 146 | return 0; |
| 147 | 147 | ||
| 148 | rx51_spk_func = ucontrol->value.integer.value[0]; | 148 | rx51_spk_func = ucontrol->value.enumerated.item[0]; |
| 149 | rx51_ext_control(&card->dapm); | 149 | rx51_ext_control(&card->dapm); |
| 150 | 150 | ||
| 151 | return 1; | 151 | return 1; |
| @@ -180,7 +180,7 @@ static int rx51_hp_event(struct snd_soc_dapm_widget *w, | |||
| 180 | static int rx51_get_input(struct snd_kcontrol *kcontrol, | 180 | static int rx51_get_input(struct snd_kcontrol *kcontrol, |
| 181 | struct snd_ctl_elem_value *ucontrol) | 181 | struct snd_ctl_elem_value *ucontrol) |
| 182 | { | 182 | { |
| 183 | ucontrol->value.integer.value[0] = rx51_dmic_func; | 183 | ucontrol->value.enumerated.item[0] = rx51_dmic_func; |
| 184 | 184 | ||
| 185 | return 0; | 185 | return 0; |
| 186 | } | 186 | } |
| @@ -190,10 +190,10 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol, | |||
| 190 | { | 190 | { |
| 191 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); | 191 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); |
| 192 | 192 | ||
| 193 | if (rx51_dmic_func == ucontrol->value.integer.value[0]) | 193 | if (rx51_dmic_func == ucontrol->value.enumerated.item[0]) |
| 194 | return 0; | 194 | return 0; |
| 195 | 195 | ||
| 196 | rx51_dmic_func = ucontrol->value.integer.value[0]; | 196 | rx51_dmic_func = ucontrol->value.enumerated.item[0]; |
| 197 | rx51_ext_control(&card->dapm); | 197 | rx51_ext_control(&card->dapm); |
| 198 | 198 | ||
| 199 | return 1; | 199 | return 1; |
| @@ -202,7 +202,7 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol, | |||
| 202 | static int rx51_get_jack(struct snd_kcontrol *kcontrol, | 202 | static int rx51_get_jack(struct snd_kcontrol *kcontrol, |
| 203 | struct snd_ctl_elem_value *ucontrol) | 203 | struct snd_ctl_elem_value *ucontrol) |
| 204 | { | 204 | { |
| 205 | ucontrol->value.integer.value[0] = rx51_jack_func; | 205 | ucontrol->value.enumerated.item[0] = rx51_jack_func; |
| 206 | 206 | ||
| 207 | return 0; | 207 | return 0; |
| 208 | } | 208 | } |
| @@ -212,10 +212,10 @@ static int rx51_set_jack(struct snd_kcontrol *kcontrol, | |||
| 212 | { | 212 | { |
| 213 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); | 213 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); |
| 214 | 214 | ||
| 215 | if (rx51_jack_func == ucontrol->value.integer.value[0]) | 215 | if (rx51_jack_func == ucontrol->value.enumerated.item[0]) |
| 216 | return 0; | 216 | return 0; |
| 217 | 217 | ||
| 218 | rx51_jack_func = ucontrol->value.integer.value[0]; | 218 | rx51_jack_func = ucontrol->value.enumerated.item[0]; |
| 219 | rx51_ext_control(&card->dapm); | 219 | rx51_ext_control(&card->dapm); |
| 220 | 220 | ||
| 221 | return 1; | 221 | return 1; |
