Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / pci / emu10k1 / emu10k1_synth.c

diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c
index 8bd58d1..204995a 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_synth.c
+++ b/sound/pci/emu10k1/emu10k1_synth.c
@@ -28,11 +28,11 @@ MODULE_LICENSE("GPL");
 /*
  * create a new hardware dependent device for Emu10k1
  */
-static int snd_emu10k1_synth_new_device(snd_seq_device_t *dev)
+static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev)
 {
-       snd_emux_t *emu;
-       emu10k1_t *hw;
-       snd_emu10k1_synth_arg_t *arg;
+       struct snd_emux *emu;
+       struct snd_emu10k1 *hw;
+       struct snd_emu10k1_synth_arg *arg;
        unsigned long flags;
 
        arg = SNDRV_SEQ_DEVICE_ARGPTR(dev);
@@ -62,7 +62,6 @@ static int snd_emu10k1_synth_new_device(snd_seq_device_t *dev)
 
        if (snd_emux_register(emu, dev->card, arg->index, "Emu10k1") < 0) {
                snd_emux_free(emu);
-               emu->hw = NULL;
                return -ENOMEM;
        }
 
@@ -76,10 +75,10 @@ static int snd_emu10k1_synth_new_device(snd_seq_device_t *dev)
        return 0;
 }
 
-static int snd_emu10k1_synth_delete_device(snd_seq_device_t *dev)
+static int snd_emu10k1_synth_delete_device(struct snd_seq_device *dev)
 {
-       snd_emux_t *emu;
-       emu10k1_t *hw;
+       struct snd_emux *emu;
+       struct snd_emu10k1 *hw;
        unsigned long flags;
 
        if (dev->driver_data == NULL)
@@ -104,11 +103,12 @@ static int snd_emu10k1_synth_delete_device(snd_seq_device_t *dev)
 static int __init alsa_emu10k1_synth_init(void)
 {
        
-       static snd_seq_dev_ops_t ops = {
+       static struct snd_seq_dev_ops ops = {
                snd_emu10k1_synth_new_device,
                snd_emu10k1_synth_delete_device,
        };
-       return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops, sizeof(snd_emu10k1_synth_arg_t));
+       return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
+                                             sizeof(struct snd_emu10k1_synth_arg));
 }
 
 static void __exit alsa_emu10k1_synth_exit(void)