summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2008-07-20 17:36:20 +0200
committerTakashi Iwai <tiwai@suse.de>2008-07-20 17:39:38 +0200
commit9432484110263e9418f380faf05fa9e2e7fb87a0 (patch)
tree502c01fc728d3ece7fd3a217ccd1339e1fa60a8d /sound
parentf53281e62a41ac176f050307c0d746a1183a68e8 (diff)
downloadlinux-stable-9432484110263e9418f380faf05fa9e2e7fb87a0.tar.gz
linux-stable-9432484110263e9418f380faf05fa9e2e7fb87a0.tar.bz2
linux-stable-9432484110263e9418f380faf05fa9e2e7fb87a0.zip
ALSA: soc - wm9712 mono mixer
this fixes typo in wm9712 codec which prevents it from registering all audio routes (and thus working correctly). Please consider applying. (Tested and works on palmtx, palmld and palmt5) Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Mark Brown <brooie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm9712.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 9fc8edd82225..1fb7f9a7aecd 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -427,20 +427,20 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"HPOUTR", NULL, "Headphone PGA"},
{"Headphone PGA", NULL, "Right HP Mixer"},
- /* mono hp mixer */
- {"Mono HP Mixer", NULL, "Left HP Mixer"},
- {"Mono HP Mixer", NULL, "Right HP Mixer"},
+ /* mono mixer */
+ {"Mono Mixer", NULL, "Left HP Mixer"},
+ {"Mono Mixer", NULL, "Right HP Mixer"},
/* Out3 Mux */
{"Out3 Mux", "Left", "Left HP Mixer"},
{"Out3 Mux", "Mono", "Phone Mixer"},
- {"Out3 Mux", "Left + Right", "Mono HP Mixer"},
+ {"Out3 Mux", "Left + Right", "Mono Mixer"},
{"Out 3 PGA", NULL, "Out3 Mux"},
{"OUT3", NULL, "Out 3 PGA"},
/* speaker Mux */
{"Speaker Mux", "Speaker Mix", "Speaker Mixer"},
- {"Speaker Mux", "Headphone Mix", "Mono HP Mixer"},
+ {"Speaker Mux", "Headphone Mix", "Mono Mixer"},
{"Speaker PGA", NULL, "Speaker Mux"},
{"LOUT2", NULL, "Speaker PGA"},
{"ROUT2", NULL, "Speaker PGA"},