vserver 1.9.3

[linux-2.6.git] / sound / pci / au88x0 / au88x0_mixer.c

diff --git a/sound/pci/au88x0/au88x0_mixer.c b/sound/pci/au88x0/au88x0_mixer.c
index c4f9413..477b2d1 100644 (file)
--- a/sound/pci/au88x0/au88x0_mixer.c
+++ b/sound/pci/au88x0/au88x0_mixer.c
@@ -13,14 +13,15 @@
 
 static int __devinit snd_vortex_mixer(vortex_t * vortex)
 {
-       ac97_bus_t bus, *pbus;
-       ac97_t ac97;
+       ac97_bus_t *pbus;
+       ac97_template_t ac97;
        int err;
+       static ac97_bus_ops_t ops = {
+               .write = vortex_codec_write,
+               .read = vortex_codec_read,
+       };
 
-       memset(&bus, 0, sizeof(bus));
-       bus.write = vortex_codec_write;
-       bus.read = vortex_codec_read;
-       if ((err = snd_ac97_bus(vortex->card, &bus, &pbus)) < 0)
+       if ((err = snd_ac97_bus(vortex->card, 0, &ops, NULL, &pbus)) < 0)
                return err;
        memset(&ac97, 0, sizeof(ac97));
        // Intialize AC97 codec stuff.