Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[pandora-kernel.git] / sound / pci / hda / patch_via.c

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 4c839b0..ba32d1e 100644 (file)
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -35,7 +35,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
@@ -378,6 +377,17 @@ static int via_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
 }
 
+static int via_dig_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 via_spec *spec = codec->spec;
+       return snd_hda_multi_out_dig_prepare(codec, &spec->multiout,
+                                            stream_tag, format, substream);
+}
+
 /*
  * Analog capture
  */
@@ -434,7 +444,8 @@ static struct hda_pcm_stream vt1708_pcm_digital_playback = {
        /* NID is set in via_build_pcms */
        .ops = {
                .open = via_dig_playback_pcm_open,
-               .close = via_dig_playback_pcm_close
+               .close = via_dig_playback_pcm_close,
+               .prepare = via_dig_playback_pcm_prepare
        },
 };