From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 4 Nov 2008 16:48:39 +0000 (+0100)
Subject: ALSA: hda - Don't create empty PCM streams
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bfc5c26fb692fa7a196108c3b23d9c747d105c00;p=deliverable%2Flinux.git

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>
---

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)
 			struct hda_pcm *cpcm = &codec->pcm_info[pcm];
 			int type = cpcm->pcm_type;
 			int dev;
+
+			if (!cpcm->stream[0].substreams &&
+			    !cpcm->stream[1].substreams)
+				continue; /* no substreams assigned */
+
 			switch (type) {
 			case HDA_PCM_TYPE_AUDIO:
 				if (num_devs[type] >= ARRAY_SIZE(audio_idx)) {