redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: hda - reorder intelhdmi prepare/cleanup callbacks 

No behavior change.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Wu Fengguang 2009-10-30 11:43:03 +01:00 committed by Takashi Iwai
parent 70ca35fb42
commit ddb8152b05
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sound/pci/hda/patch_intelhdmi.c
View File

@ -543,18 +543,6 @@ 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,
struct hda_codec *codec,
struct snd_pcm_substream *substream)
{
struct intel_hdmi_spec *spec = codec->spec;
hdmi_stop_infoframe_trans(codec, pin_nid);
snd_hda_codec_cleanup_stream(codec, hinfo->nid);
return 0;
}
static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
unsigned int stream_tag,
@ -570,6 +558,18 @@ static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
return 0;
}
static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream)
{
struct intel_hdmi_spec *spec = codec->spec;
hdmi_stop_infoframe_trans(codec, pin_nid);
snd_hda_codec_cleanup_stream(codec, hinfo->nid);
return 0;
}
static struct hda_pcm_stream intel_hdmi_pcm_playback = {
.substreams = 1,
.channels_min = 2,