summaryrefslogtreecommitdiff
path: root/sound/pci/hda/patch_ca0110.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-20 12:49:25 +0400
committerTakashi Iwai <tiwai@suse.de>2009-04-20 12:49:25 +0400
commit67667263674663767ddf4250bab2437a00ee780e (patch)
treee5a17e2cc628177ed6c382bb3aad4b430066a7ca /sound/pci/hda/patch_ca0110.c
parent18cb7109d3e83195b605ff2905981020e86f72ca (diff)
downloadlinux-67667263674663767ddf4250bab2437a00ee780e.tar.xz
ALSA: hda - Fix channels_max setting for CA0110
Added the missing definition of max channels for CA0110, which resulted in an error at opening PCM devices. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_ca0110.c')
-rw-r--r--sound/pci/hda/patch_ca0110.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c
index 7ec41daa3f0c..9398d92f18bd 100644
--- a/sound/pci/hda/patch_ca0110.c
+++ b/sound/pci/hda/patch_ca0110.c
@@ -309,7 +309,7 @@ static int ca0110_build_pcms(struct hda_codec *codec)
info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ca0110_pcm_analog_playback;
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->dacs[0];
info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =
- spec->multiout.num_dacs * 2;
+ spec->multiout.max_channels;
info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0110_pcm_analog_capture;
info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_inputs;
info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[0];
@@ -418,6 +418,7 @@ static void parse_line_outs(struct hda_codec *codec)
}
spec->multiout.dac_nids = spec->dacs;
spec->multiout.num_dacs = n;
+ spec->multiout.max_channels = n * 2;
}
static void parse_hp_out(struct hda_codec *codec)