aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/ctxfi/ctmixer.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c
index db710d0a609f..4777d50fbbf8 100644
--- a/sound/pci/ctxfi/ctmixer.c
+++ b/sound/pci/ctxfi/ctmixer.c
@@ -938,17 +938,18 @@ static int ct_mixer_topology_build(struct ct_mixer *mixer)
938 struct sum *sum; 938 struct sum *sum;
939 struct amixer *amix_d, *amix_s; 939 struct amixer *amix_d, *amix_s;
940 enum CT_AMIXER_CTL i, j; 940 enum CT_AMIXER_CTL i, j;
941 enum CT_SUM_CTL k;
941 942
942 /* Build topology from destination to source */ 943 /* Build topology from destination to source */
943 944
944 /* Set up Master mixer */ 945 /* Set up Master mixer */
945 for (i = AMIXER_MASTER_F, j = SUM_IN_F; 946 for (i = AMIXER_MASTER_F, k = SUM_IN_F;
946 i <= AMIXER_MASTER_S; i++, j++) { 947 i <= AMIXER_MASTER_S; i++, k++) {
947 amix_d = mixer->amixers[i*CHN_NUM]; 948 amix_d = mixer->amixers[i*CHN_NUM];
948 sum = mixer->sums[j*CHN_NUM]; 949 sum = mixer->sums[k*CHN_NUM];
949 amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL); 950 amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL);
950 amix_d = mixer->amixers[i*CHN_NUM+1]; 951 amix_d = mixer->amixers[i*CHN_NUM+1];
951 sum = mixer->sums[j*CHN_NUM+1]; 952 sum = mixer->sums[k*CHN_NUM+1];
952 amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL); 953 amix_d->ops->setup(amix_d, &sum->rsc, INIT_VOL, NULL);
953 } 954 }
954 955
@@ -972,12 +973,12 @@ static int ct_mixer_topology_build(struct ct_mixer *mixer)
972 amix_d->ops->setup(amix_d, &amix_s->rsc, INIT_VOL, NULL); 973 amix_d->ops->setup(amix_d, &amix_s->rsc, INIT_VOL, NULL);
973 974
974 /* Set up PCM-in mixer */ 975 /* Set up PCM-in mixer */
975 for (i = AMIXER_PCM_F, j = SUM_IN_F; i <= AMIXER_PCM_S; i++, j++) { 976 for (i = AMIXER_PCM_F, k = SUM_IN_F; i <= AMIXER_PCM_S; i++, k++) {
976 amix_d = mixer->amixers[i*CHN_NUM]; 977 amix_d = mixer->amixers[i*CHN_NUM];
977 sum = mixer->sums[j*CHN_NUM]; 978 sum = mixer->sums[k*CHN_NUM];
978 amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); 979 amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum);
979 amix_d = mixer->amixers[i*CHN_NUM+1]; 980 amix_d = mixer->amixers[i*CHN_NUM+1];
980 sum = mixer->sums[j*CHN_NUM+1]; 981 sum = mixer->sums[k*CHN_NUM+1];
981 amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum); 982 amix_d->ops->setup(amix_d, NULL, INIT_VOL, sum);
982 } 983 }
983 984