vserver 1.9.5.x5

[linux-2.6.git] / sound / pci / vx222 / vx222.c

diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 4dd658d..4ffbb25 100644 (file)
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -40,17 +40,16 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static int mic[SNDRV_CARDS]; /* microphone */
 static int ibl[SNDRV_CARDS]; /* microphone */
-static int boot_devs;
 
-module_param_array(index, int, boot_devs, 0444);
+module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Digigram " CARD_NAME " soundcard.");
-module_param_array(id, charp, boot_devs, 0444);
+module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for Digigram " CARD_NAME " soundcard.");
-module_param_array(enable, bool, boot_devs, 0444);
+module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard.");
-module_param_array(mic, bool, boot_devs, 0444);
+module_param_array(mic, bool, NULL, 0444);
 MODULE_PARM_DESC(mic, "Enable Microphone.");
-module_param_array(ibl, int, boot_devs, 0444);
+module_param_array(ibl, int, NULL, 0444);
 MODULE_PARM_DESC(ibl, "Capture IBL size.");
 
 /*
@@ -62,8 +61,8 @@ enum {
 };
 
 static struct pci_device_id snd_vx222_ids[] = {
-       { 0x10b5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, },   /* PLX */
-       { 0x10b5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, },   /* PLX */
+       { 0x10b5, 0x9050, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, },   /* PLX */
+       { 0x10b5, 0x9030, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, },   /* PLX */
        { 0, }
 };
 
@@ -117,6 +116,7 @@ static int snd_vx222_free(vx_core_t *chip)
                free_irq(chip->irq, (void*)chip);
        if (vx->port[0])
                pci_release_regions(vx->pci);
+       pci_disable_device(vx->pci);
        kfree(chip);
        return 0;
 }
@@ -148,8 +148,10 @@ static int __devinit snd_vx222_create(snd_card_t *card, struct pci_dev *pci,
        vx_ops = hw->type == VX_TYPE_BOARD ? &vx222_old_ops : &vx222_ops;
        chip = snd_vx_create(card, hw, vx_ops,
                             sizeof(struct snd_vx222) - sizeof(vx_core_t));
-       if (! chip)
+       if (! chip) {
+               pci_disable_device(pci);
                return -ENOMEM;
+       }
        vx = (struct snd_vx222 *)chip;
        vx->pci = pci;
 
@@ -223,7 +225,11 @@ static int __devinit snd_vx222_probe(struct pci_dev *pci,
        snd_printdd("%s at 0x%lx & 0x%lx, irq %i\n",
                    card->shortname, vx->port[0], vx->port[1], vx->core.irq);
 
-       if ((err = snd_vx_hwdep_new(&vx->core)) < 0) {
+#ifdef SND_VX_FW_LOADER
+       vx->core.dev = &pci->dev;
+#endif
+
+       if ((err = snd_vx_setup_firmware(&vx->core)) < 0) {
                snd_card_free(card);
                return err;
        }
@@ -249,6 +255,7 @@ static struct pci_driver driver = {
        .id_table = snd_vx222_ids,
        .probe = snd_vx222_probe,
        .remove = __devexit_p(snd_vx222_remove),
+       SND_PCI_PM_CALLBACKS
 };
 
 static int __init alsa_card_vx222_init(void)