ALSA: hda - Fix WARNING from HDMI/DP parser
authorTakashi Iwai <tiwai@suse.de>
Fri, 27 Jul 2012 14:01:54 +0000 (16:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 27 Jul 2012 16:29:58 +0000 (18:29 +0200)
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>
sound/pci/hda/patch_hdmi.c

index 85853b4e42dcd87f0e6721d663e1b2e8d3e32707..69b928449789e22afcaef39a67dea3323bc5e5e7 100644 (file)
@@ -877,6 +877,8 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
        struct hdmi_eld *eld;
        struct hdmi_spec_per_cvt *per_cvt = NULL;
 
+       hinfo->nid = 0; /* clear the leftover value */
+
        /* Validate hinfo */
        pin_idx = hinfo_to_pin_index(spec, hinfo);
        if (snd_BUG_ON(pin_idx < 0))
@@ -1218,6 +1220,7 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)
                pstr = &info->stream[SNDRV_PCM_STREAM_PLAYBACK];
                pstr->substreams = 1;
                pstr->ops = generic_ops;
+               pstr->nid = 1; /* FIXME: just for avoiding a debug WARNING */
                /* other pstr fields are set in open */
        }