diff options
-rw-r--r-- | sound/soc/pxa/spitz.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index b00222620fd0..0e02634c8b7f 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -164,7 +164,7 @@ static struct snd_soc_ops spitz_ops = { | |||
164 | static int spitz_get_jack(struct snd_kcontrol *kcontrol, | 164 | static int spitz_get_jack(struct snd_kcontrol *kcontrol, |
165 | struct snd_ctl_elem_value *ucontrol) | 165 | struct snd_ctl_elem_value *ucontrol) |
166 | { | 166 | { |
167 | ucontrol->value.integer.value[0] = spitz_jack_func; | 167 | ucontrol->value.enumerated.item[0] = spitz_jack_func; |
168 | return 0; | 168 | return 0; |
169 | } | 169 | } |
170 | 170 | ||
@@ -173,10 +173,10 @@ static int spitz_set_jack(struct snd_kcontrol *kcontrol, | |||
173 | { | 173 | { |
174 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); | 174 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); |
175 | 175 | ||
176 | if (spitz_jack_func == ucontrol->value.integer.value[0]) | 176 | if (spitz_jack_func == ucontrol->value.enumerated.item[0]) |
177 | return 0; | 177 | return 0; |
178 | 178 | ||
179 | spitz_jack_func = ucontrol->value.integer.value[0]; | 179 | spitz_jack_func = ucontrol->value.enumerated.item[0]; |
180 | spitz_ext_control(&card->dapm); | 180 | spitz_ext_control(&card->dapm); |
181 | return 1; | 181 | return 1; |
182 | } | 182 | } |
@@ -184,7 +184,7 @@ static int spitz_set_jack(struct snd_kcontrol *kcontrol, | |||
184 | static int spitz_get_spk(struct snd_kcontrol *kcontrol, | 184 | static int spitz_get_spk(struct snd_kcontrol *kcontrol, |
185 | struct snd_ctl_elem_value *ucontrol) | 185 | struct snd_ctl_elem_value *ucontrol) |
186 | { | 186 | { |
187 | ucontrol->value.integer.value[0] = spitz_spk_func; | 187 | ucontrol->value.enumerated.item[0] = spitz_spk_func; |
188 | return 0; | 188 | return 0; |
189 | } | 189 | } |
190 | 190 | ||
@@ -193,10 +193,10 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, | |||
193 | { | 193 | { |
194 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); | 194 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); |
195 | 195 | ||
196 | if (spitz_spk_func == ucontrol->value.integer.value[0]) | 196 | if (spitz_spk_func == ucontrol->value.enumerated.item[0]) |
197 | return 0; | 197 | return 0; |
198 | 198 | ||
199 | spitz_spk_func = ucontrol->value.integer.value[0]; | 199 | spitz_spk_func = ucontrol->value.enumerated.item[0]; |
200 | spitz_ext_control(&card->dapm); | 200 | spitz_ext_control(&card->dapm); |
201 | return 1; | 201 | return 1; |
202 | } | 202 | } |