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/atmel', 'asoc/topic/bcm2835' and 'asoc...
[cascardo/linux.git]
/
sound
/
soc
/
codecs
/
cs42l51.c
diff --git
a/sound/soc/codecs/cs42l51.c
b/sound/soc/codecs/cs42l51.c
index
b395152
..
35488f1
100644
(file)
--- a/
sound/soc/codecs/cs42l51.c
+++ b/
sound/soc/codecs/cs42l51.c
@@
-60,15
+60,15
@@
static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol,
switch (value) {
default:
case 0:
switch (value) {
default:
case 0:
- ucontrol->value.
integer.value
[0] = 0;
+ ucontrol->value.
enumerated.item
[0] = 0;
break;
/* same value : (L+R)/2 and (R+L)/2 */
case 1:
case 2:
break;
/* same value : (L+R)/2 and (R+L)/2 */
case 1:
case 2:
- ucontrol->value.
integer.value
[0] = 1;
+ ucontrol->value.
enumerated.item
[0] = 1;
break;
case 3:
break;
case 3:
- ucontrol->value.
integer.value
[0] = 2;
+ ucontrol->value.
enumerated.item
[0] = 2;
break;
}
break;
}
@@
-85,7
+85,7
@@
static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
unsigned char val;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
unsigned char val;
- switch (ucontrol->value.
integer.value
[0]) {
+ switch (ucontrol->value.
enumerated.item
[0]) {
default:
case 0:
val = CHAN_MIX_NORMAL;
default:
case 0:
val = CHAN_MIX_NORMAL;