summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorNicolas Graziano <nicolas.graziano@wanadoo.fr>2005-07-27 17:25:08 +0200
committerJaroslav Kysela <perex@suse.cz>2005-07-28 12:27:00 +0200
commitfb92e6f05e84f6c217d786208e2ed5acf633b6ce (patch)
tree26c3b923a6b2f61e2ad6572d282de252eb9d5e8f /sound
parent5a0f217d96656068f0f1e5cda16c35945f979b16 (diff)
downloadlinux-3.10-fb92e6f05e84f6c217d786208e2ed5acf633b6ce.tar.gz
linux-3.10-fb92e6f05e84f6c217d786208e2ed5acf633b6ce.tar.bz2
linux-3.10-fb92e6f05e84f6c217d786208e2ed5acf633b6ce.zip
[ALSA] hda driver, correct bug in model 'auto'
HDA Codec driver - Correct some index variable inversion in patch_cmedia.c Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_cmedia.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index 2d6e3e3d0a3..86f195f19ee 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -408,7 +408,7 @@ static int cmi9880_fill_multi_dac_nids(struct hda_codec *codec, const struct aut
/* search for an empty channel */
for (j = 0; j < cfg->line_outs; j++) {
if (! assigned[j]) {
- spec->dac_nids[i] = i + 0x03;
+ spec->dac_nids[i] = j + 0x03;
assigned[j] = 1;
break;
}
@@ -444,11 +444,10 @@ static int cmi9880_fill_multi_init(struct hda_codec *codec, const struct auto_pi
len = snd_hda_get_connections(codec, nid, conn, 4);
for (k = 0; k < len; k++)
if (conn[k] == spec->dac_nids[i]) {
- spec->multi_init[j].param = j;
+ spec->multi_init[j].param = k;
break;
}
j++;
- break;
}
}
return 0;