1 files changed, 7 insertions, 7 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 641408dc28c0..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,
         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))
@@ -1161,9 +1163,9 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
         return hdmi_setup_stream(codec, cvt_nid, pin_nid, stream_tag, format);
 }
 
-static int generic_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                             struct hda_codec *codec,
-                                             struct snd_pcm_substream *substream)
+static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
+                          struct hda_codec *codec,
+                          struct snd_pcm_substream *substream)
 {
         struct hdmi_spec *spec = codec->spec;
         int cvt_idx, pin_idx;
@@ -1171,8 +1173,6 @@ static int generic_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
         struct hdmi_spec_per_pin *per_pin;
         int pinctl;
 
-        snd_hda_codec_cleanup_stream(codec, hinfo->nid);
-
         if (hinfo->nid) {
                 cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid);
                 if (snd_BUG_ON(cvt_idx < 0))
@@ -1195,14 +1195,13 @@ static int generic_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
                                     pinctl & ~PIN_OUT);
                 snd_hda_spdif_ctls_unassign(codec, pin_idx);
         }
-
         return 0;
 }
 
 static const struct hda_pcm_ops generic_ops = {
         .open = hdmi_pcm_open,
+        .close = hdmi_pcm_close,
         .prepare = generic_hdmi_playback_pcm_prepare,
-        .cleanup = generic_hdmi_playback_pcm_cleanup,
 };
 
 static int generic_hdmi_build_pcms(struct hda_codec *codec)
@@ -1221,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 */
         }