projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/adau17x1', 'asoc...
[cascardo/linux.git]
/
sound
/
soc
/
codecs
/
wm8983.c
diff --git
a/sound/soc/codecs/wm8983.c
b/sound/soc/codecs/wm8983.c
index
7350ff6
..
0c002a5
100644
(file)
--- a/
sound/soc/codecs/wm8983.c
+++ b/
sound/soc/codecs/wm8983.c
@@
-497,9
+497,9
@@
static int eqmode_get(struct snd_kcontrol *kcontrol,
reg = snd_soc_read(codec, WM8983_EQ1_LOW_SHELF);
if (reg & WM8983_EQ3DMODE)
reg = snd_soc_read(codec, WM8983_EQ1_LOW_SHELF);
if (reg & WM8983_EQ3DMODE)
- ucontrol->value.
integer.value
[0] = 1;
+ ucontrol->value.
enumerated.item
[0] = 1;
else
else
- ucontrol->value.
integer.value
[0] = 0;
+ ucontrol->value.
enumerated.item
[0] = 0;
return 0;
}
return 0;
}
@@
-511,18
+511,18
@@
static int eqmode_put(struct snd_kcontrol *kcontrol,
unsigned int regpwr2, regpwr3;
unsigned int reg_eq;
unsigned int regpwr2, regpwr3;
unsigned int reg_eq;
- if (ucontrol->value.
integer.value
[0] != 0
- && ucontrol->value.
integer.value
[0] != 1)
+ if (ucontrol->value.
enumerated.item
[0] != 0
+ && ucontrol->value.
enumerated.item
[0] != 1)
return -EINVAL;
reg_eq = snd_soc_read(codec, WM8983_EQ1_LOW_SHELF);
switch ((reg_eq & WM8983_EQ3DMODE) >> WM8983_EQ3DMODE_SHIFT) {
case 0:
return -EINVAL;
reg_eq = snd_soc_read(codec, WM8983_EQ1_LOW_SHELF);
switch ((reg_eq & WM8983_EQ3DMODE) >> WM8983_EQ3DMODE_SHIFT) {
case 0:
- if (!ucontrol->value.
integer.value
[0])
+ if (!ucontrol->value.
enumerated.item
[0])
return 0;
break;
case 1:
return 0;
break;
case 1:
- if (ucontrol->value.
integer.value
[0])
+ if (ucontrol->value.
enumerated.item
[0])
return 0;
break;
}
return 0;
break;
}
@@
-537,7
+537,7
@@
static int eqmode_put(struct snd_kcontrol *kcontrol,
/* set the desired eqmode */
snd_soc_update_bits(codec, WM8983_EQ1_LOW_SHELF,
WM8983_EQ3DMODE_MASK,
/* set the desired eqmode */
snd_soc_update_bits(codec, WM8983_EQ1_LOW_SHELF,
WM8983_EQ3DMODE_MASK,
- ucontrol->value.
integer.value
[0]
+ ucontrol->value.
enumerated.item
[0]
<< WM8983_EQ3DMODE_SHIFT);
/* restore DAC/ADC configuration */
snd_soc_write(codec, WM8983_POWER_MANAGEMENT_2, regpwr2);
<< WM8983_EQ3DMODE_SHIFT);
/* restore DAC/ADC configuration */
snd_soc_write(codec, WM8983_POWER_MANAGEMENT_2, regpwr2);