From: Mika Laitio Date: Tue, 5 Sep 2006 15:14:54 +0000 (+0300) Subject: [PATCH] tsc2101 mixer fixes X-Git-Tag: v2.6.18-omap1~88^2~3 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a94ebe2c8e9d18e6a007964343517f6b7abfc80c;p=linux-2.6-omap-h63xx.git [PATCH] tsc2101 mixer fixes 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 Signed-off-by: Tony Lindgren --- diff --git a/sound/arm/omap/omap-alsa-tsc2101-mixer.c b/sound/arm/omap/omap-alsa-tsc2101-mixer.c index 0fc31efb3f2..1c7627f3c02 100644 --- a/sound/arm/omap/omap-alsa-tsc2101-mixer.c +++ b/sound/arm/omap/omap-alsa-tsc2101-mixer.c @@ -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,