]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] tsc2101 mixer fixes
authorMika Laitio <lamikr@cc.jyu.fi>
Tue, 5 Sep 2006 15:14:54 +0000 (18:14 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Sep 2006 15:14:54 +0000 (18:14 +0300)
tsc2101 mixer fixes. Fix target selection control name and set index to
0 for all controls as the driver uses always same tsc2101 codec.

Signed-off-by: Mika Laitio <lamikr@cc.jyu.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
sound/arm/omap/omap-alsa-tsc2101-mixer.c

index 0fc31efb3f2022dfcd58e84b62fe89159882bc9f..1c7627f3c025b18dbff26a697a2e10d7949a3c12 100644 (file)
@@ -728,7 +728,7 @@ static int __handset_playback_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_
 
 static snd_kcontrol_new_t tsc2101_control[] __devinitdata = {
        {
-               .name  = "Playback Playback Route",
+               .name  = "Target Playback Route",
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .index = 0,
                .access= SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -754,7 +754,7 @@ static snd_kcontrol_new_t tsc2101_control[] __devinitdata = {
        }, {
                .name  = "Headset Playback Volume",
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .index = 1,
+               .index = 0,
                .access= SNDRV_CTL_ELEM_ACCESS_READWRITE,
                .info  = __headset_playback_volume_info,
                .get   = __headset_playback_volume_get,
@@ -762,7 +762,7 @@ static snd_kcontrol_new_t tsc2101_control[] __devinitdata = {
        }, {
                .name  = "Headset Playback Switch",
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .index = 1,
+               .index = 0,
                .access= SNDRV_CTL_ELEM_ACCESS_READWRITE,
                .info  = __headset_playback_switch_info,
                .get   = __headset_playback_switch_get,
@@ -770,7 +770,7 @@ static snd_kcontrol_new_t tsc2101_control[] __devinitdata = {
        }, {
                .name  = "Handset Playback Volume",
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .index = 2,
+               .index = 0,
                .access= SNDRV_CTL_ELEM_ACCESS_READWRITE,
                .info  = __handset_playback_volume_info,
                .get   = __handset_playback_volume_get,
@@ -778,7 +778,7 @@ static snd_kcontrol_new_t tsc2101_control[] __devinitdata = {
        }, {
                .name  = "Handset Playback Switch",
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .index = 2,
+               .index = 0,
                .access= SNDRV_CTL_ELEM_ACCESS_READWRITE,
                .info  = __handset_playback_switch_info,
                .get   = __handset_playback_switch_get,