diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:16:56 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:16:56 -0400 |
| commit | 2603798070a80d76e7e6d2992ba4ec74addcec90 (patch) | |
| tree | 7a1cdc33bd9bbf3807db239205de02d6beb58e30 /sound/pci/hda/patch_intelhdmi.c | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
| parent | fc091769a5aa65c045bfbda149c424ba33d0abbb (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_intelhdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_intelhdmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c index b81d23e42ace..5972d5e7d01f 100644 --- a/sound/pci/hda/patch_intelhdmi.c +++ b/sound/pci/hda/patch_intelhdmi.c | |||
| @@ -66,8 +66,7 @@ static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | |||
| 66 | 66 | ||
| 67 | hdmi_setup_audio_infoframe(codec, hinfo->nid, substream); | 67 | hdmi_setup_audio_infoframe(codec, hinfo->nid, substream); |
| 68 | 68 | ||
| 69 | hdmi_setup_stream(codec, hinfo->nid, stream_tag, format); | 69 | return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format); |
| 70 | return 0; | ||
| 71 | } | 70 | } |
| 72 | 71 | ||
| 73 | static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, | 72 | static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, |