projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
60ea4ce
)
ASoC: twl6040: Fix analog Mic L & R mux controls
author
Francois Mazard
<f-mazard@ti.com>
Sat, 11 Dec 2010 03:06:03 +0000
(21:06 -0600)
committer
Liam Girdwood
<lrg@slimlogic.co.uk>
Tue, 14 Dec 2010 20:36:38 +0000
(20:36 +0000)
The mux control has 4 elements not 3
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/twl6040.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/twl6040.c
b/sound/soc/codecs/twl6040.c
index
b59d947
..
5081e81
100644
(file)
--- a/
sound/soc/codecs/twl6040.c
+++ b/
sound/soc/codecs/twl6040.c
@@
-508,8
+508,8
@@
static const char *twl6040_amicr_texts[] =
{"Headset Mic", "Sub Mic", "Aux/FM Right", "Off"};
static const struct soc_enum twl6040_enum[] = {
- SOC_ENUM_SINGLE(TWL6040_REG_MICLCTL, 3,
3
, twl6040_amicl_texts),
- SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3,
3
, twl6040_amicr_texts),
+ SOC_ENUM_SINGLE(TWL6040_REG_MICLCTL, 3,
4
, twl6040_amicl_texts),
+ SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3,
4
, twl6040_amicr_texts),
};
static const char *twl6040_hs_texts[] = {