diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:16:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:16:56 +0200 |
| commit | 2603798070a80d76e7e6d2992ba4ec74addcec90 (patch) | |
| tree | 7a1cdc33bd9bbf3807db239205de02d6beb58e30 /sound/pci/hda/patch_nvhdmi.c | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
| parent | fc091769a5aa65c045bfbda149c424ba33d0abbb (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_nvhdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_nvhdmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index b0652acee9b2..a281836fd472 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -202,8 +202,7 @@ static int nvhdmi_dig_playback_pcm_prepare_8ch_89(struct hda_pcm_stream *hinfo, hdmi_setup_audio_infoframe(codec, hinfo->nid, substream); - hdmi_setup_stream(codec, hinfo->nid, stream_tag, format); - return 0; + return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format); } static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo, |