aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-02-29 11:26:21 -0500
committerMark Brown <broonie@kernel.org>2016-02-29 22:02:47 -0500
commitdd90533cd6bbfe075a72ab789b6e9d6f280ba476 (patch)
treeeaf9e3e27f91e9b503864473e74d449814c68914
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
ASoC: omap: n810: Fix enum ctl accesses in a wrong type
"Jack Function", "Speaker Function" and "Input Select" ctls in n810 driver are enum, while the current driver accesses wrongly via value.integer.value[]. They have to be via value.enumerated.item[] instead. Signed-off-by: Takashi Iwai <tiwai@suse.de> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/omap/n810.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 190f868e78b2..fdecb7043174 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -133,7 +133,7 @@ static struct snd_soc_ops n810_ops = {
133static int n810_get_spk(struct snd_kcontrol *kcontrol, 133static int n810_get_spk(struct snd_kcontrol *kcontrol,
134 struct snd_ctl_elem_value *ucontrol) 134 struct snd_ctl_elem_value *ucontrol)
135{ 135{
136 ucontrol->value.integer.value[0] = n810_spk_func; 136 ucontrol->value.enumerated.item[0] = n810_spk_func;
137 137
138 return 0; 138 return 0;
139} 139}
@@ -143,10 +143,10 @@ static int n810_set_spk(struct snd_kcontrol *kcontrol,
143{ 143{
144 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 144 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
145 145
146 if (n810_spk_func == ucontrol->value.integer.value[0]) 146 if (n810_spk_func == ucontrol->value.enumerated.item[0])
147 return 0; 147 return 0;
148 148
149 n810_spk_func = ucontrol->value.integer.value[0]; 149 n810_spk_func = ucontrol->value.enumerated.item[0];
150 n810_ext_control(&card->dapm); 150 n810_ext_control(&card->dapm);
151 151
152 return 1; 152 return 1;
@@ -155,7 +155,7 @@ static int n810_set_spk(struct snd_kcontrol *kcontrol,
155static int n810_get_jack(struct snd_kcontrol *kcontrol, 155static int n810_get_jack(struct snd_kcontrol *kcontrol,
156 struct snd_ctl_elem_value *ucontrol) 156 struct snd_ctl_elem_value *ucontrol)
157{ 157{
158 ucontrol->value.integer.value[0] = n810_jack_func; 158 ucontrol->value.enumerated.item[0] = n810_jack_func;
159 159
160 return 0; 160 return 0;
161} 161}
@@ -165,10 +165,10 @@ static int n810_set_jack(struct snd_kcontrol *kcontrol,
165{ 165{
166 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 166 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
167 167
168 if (n810_jack_func == ucontrol->value.integer.value[0]) 168 if (n810_jack_func == ucontrol->value.enumerated.item[0])
169 return 0; 169 return 0;
170 170
171 n810_jack_func = ucontrol->value.integer.value[0]; 171 n810_jack_func = ucontrol->value.enumerated.item[0];
172 n810_ext_control(&card->dapm); 172 n810_ext_control(&card->dapm);
173 173
174 return 1; 174 return 1;
@@ -177,7 +177,7 @@ static int n810_set_jack(struct snd_kcontrol *kcontrol,
177static int n810_get_input(struct snd_kcontrol *kcontrol, 177static int n810_get_input(struct snd_kcontrol *kcontrol,
178 struct snd_ctl_elem_value *ucontrol) 178 struct snd_ctl_elem_value *ucontrol)
179{ 179{
180 ucontrol->value.integer.value[0] = n810_dmic_func; 180 ucontrol->value.enumerated.item[0] = n810_dmic_func;
181 181
182 return 0; 182 return 0;
183} 183}
@@ -187,10 +187,10 @@ static int n810_set_input(struct snd_kcontrol *kcontrol,
187{ 187{
188 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 188 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
189 189
190 if (n810_dmic_func == ucontrol->value.integer.value[0]) 190 if (n810_dmic_func == ucontrol->value.enumerated.item[0])
191 return 0; 191 return 0;
192 192
193 n810_dmic_func = ucontrol->value.integer.value[0]; 193 n810_dmic_func = ucontrol->value.enumerated.item[0];
194 n810_ext_control(&card->dapm); 194 n810_ext_control(&card->dapm);
195 195
196 return 1; 196 return 1;