---

yaml --- r: 170307 b: refs/heads/master c: ddb8152 h: refs/heads/master i: 170305: 2219a5d 170303: c560fec v: v3
git-mirror · Oct 30, 2009 · d17f4a9 · d17f4a9
1 parent 765233d
commit d17f4a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ca35fb42680fc4315d4a01f6c77c9a9962199c
+refs/heads/master: ddb8152b054e357907f57fb5ae65d494a3c79065
diff --git a/trunk/sound/pci/hda/patch_intelhdmi.c b/trunk/sound/pci/hda/patch_intelhdmi.c
@@ -543,30 +543,30 @@ static void intel_hdmi_unsol_event(struct hda_codec *codec, unsigned int res)
  * Callbacks
  */
 
-static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
 					   struct hda_codec *codec,
+					   unsigned int stream_tag,
+					   unsigned int format,
 					   struct snd_pcm_substream *substream)
 {
-	struct intel_hdmi_spec *spec = codec->spec;
+	hdmi_set_channel_count(codec, cvt_nid,
+			       substream->runtime->channels);
 
-	hdmi_stop_infoframe_trans(codec, pin_nid);
+	hdmi_setup_audio_infoframe(codec, cvt_nid, substream);
 
-	snd_hda_codec_cleanup_stream(codec, hinfo->nid);
+	snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);
 	return 0;
 }
 
-static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
 					   struct hda_codec *codec,
-					   unsigned int stream_tag,
-					   unsigned int format,
 					   struct snd_pcm_substream *substream)
 {
-	hdmi_set_channel_count(codec, cvt_nid,
-			       substream->runtime->channels);
+	struct intel_hdmi_spec *spec = codec->spec;
 
-	hdmi_setup_audio_infoframe(codec, cvt_nid, substream);
+	hdmi_stop_infoframe_trans(codec, pin_nid);
 
-	snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);
+	snd_hda_codec_cleanup_stream(codec, hinfo->nid);
 	return 0;
 }