aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-04 11:48:39 -0500
committerTakashi Iwai <tiwai@suse.de>2008-11-04 11:48:39 -0500
commitbfc5c26fb692fa7a196108c3b23d9c747d105c00 (patch)
tree47d72aebe5208c369e12f70f068503cb9e589a28 /sound/pci
parentb91f080f517cf9dd52023c11127a0ca33190e31a (diff)
ALSA: hda - Don't create empty PCM streams
Due to the hda-reconfiguration patches, the check of empty stream is gone, and this results in an error with the codec setup with empty streams. This patch adds the check again to avoid the error at probing. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_codec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index aa9cd142c30a..3e7cda9c3de5 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2485,6 +2485,11 @@ int snd_hda_build_pcms(struct hda_bus *bus)
2485 struct hda_pcm *cpcm = &codec->pcm_info[pcm]; 2485 struct hda_pcm *cpcm = &codec->pcm_info[pcm];
2486 int type = cpcm->pcm_type; 2486 int type = cpcm->pcm_type;
2487 int dev; 2487 int dev;
2488
2489 if (!cpcm->stream[0].substreams &&
2490 !cpcm->stream[1].substreams)
2491 continue; /* no substreams assigned */
2492
2488 switch (type) { 2493 switch (type) {
2489 case HDA_PCM_TYPE_AUDIO: 2494 case HDA_PCM_TYPE_AUDIO:
2490 if (num_devs[type] >= ARRAY_SIZE(audio_idx)) { 2495 if (num_devs[type] >= ARRAY_SIZE(audio_idx)) {