aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-07-27 10:01:54 -0400
committerTakashi Iwai <tiwai@suse.de>2012-07-27 12:29:58 -0400
commitc4bfe94a8b0670a272d3f7092cc8533bb047e33a (patch)
tree73048cf6ef15ddf73e437f9c7368213f9115aae1 /sound
parentf2ad24fa575dd4b392f123744f7c80c82c079ef9 (diff)
ALSA: hda - Fix WARNING from HDMI/DP parser
The recent fix to converter detaching timing in patch_hdmi.c leads to a kernel WARNING due to a sanity check when the debug option is set. Add a workaround by setting a dummy hinfo->nid. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_hdmi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 85853b4e42dc..69b928449789 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -877,6 +877,8 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
877 struct hdmi_eld *eld; 877 struct hdmi_eld *eld;
878 struct hdmi_spec_per_cvt *per_cvt = NULL; 878 struct hdmi_spec_per_cvt *per_cvt = NULL;
879 879
880 hinfo->nid = 0; /* clear the leftover value */
881
880 /* Validate hinfo */ 882 /* Validate hinfo */
881 pin_idx = hinfo_to_pin_index(spec, hinfo); 883 pin_idx = hinfo_to_pin_index(spec, hinfo);
882 if (snd_BUG_ON(pin_idx < 0)) 884 if (snd_BUG_ON(pin_idx < 0))
@@ -1218,6 +1220,7 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)
1218 pstr = &info->stream[SNDRV_PCM_STREAM_PLAYBACK]; 1220 pstr = &info->stream[SNDRV_PCM_STREAM_PLAYBACK];
1219 pstr->substreams = 1; 1221 pstr->substreams = 1;
1220 pstr->ops = generic_ops; 1222 pstr->ops = generic_ops;
1223 pstr->nid = 1; /* FIXME: just for avoiding a debug WARNING */
1221 /* other pstr fields are set in open */ 1224 /* other pstr fields are set in open */
1222 } 1225 }
1223 1226