1 files changed, 2 insertions, 46 deletions

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index ee1a824d8fc0..9300cf371ee8 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -1690,53 +1690,19 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
                                           const struct pnp_card_device_id *pid)
 {
         struct pnp_dev *pdev;
-        struct pnp_resource_table *cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
         int err;
 
-        if (!cfg)
-                return -ENOMEM;
         chip->dev = pnp_request_card_device(card, pid->devs[0].id, NULL);
-        if (chip->dev == NULL) {
-                kfree(cfg);
+        if (chip->dev == NULL)
                 return -EBUSY;
-        }
+
         chip->devmpu = pnp_request_card_device(card, pid->devs[1].id, NULL);
 
         pdev = chip->dev;
-        pnp_init_resource_table(cfg);
 
-#ifdef OPTi93X
-        if (port != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[0], port + 4, 4);
-#else
-        if (pid->driver_data != 0x0924 && port != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[1], port, 4);
-#endif  /* OPTi93X */
-        if (irq != SNDRV_AUTO_IRQ)
-                pnp_resource_change(&cfg->irq_resource[0], irq, 1);
-        if (dma1 != SNDRV_AUTO_DMA)
-                pnp_resource_change(&cfg->dma_resource[0], dma1, 1);
-#if defined(CS4231) || defined(OPTi93X)
-        if (dma2 != SNDRV_AUTO_DMA)
-                pnp_resource_change(&cfg->dma_resource[1], dma2, 1);
-#else
-#ifdef snd_opti9xx_fixup_dma2
-        snd_opti9xx_fixup_dma2(pdev);
-#endif
-#endif  /* CS4231 || OPTi93X */
-#ifdef OPTi93X
-        if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[1], fm_port, 4);
-#else
-        if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[2], fm_port, 4);
-#endif
-        if (pnp_manual_config_dev(pdev, cfg, 0) < 0)
-                snd_printk(KERN_ERR "AUDIO the requested resources are invalid, using auto config\n");
         err = pnp_activate_dev(pdev);
         if (err < 0) {
                 snd_printk(KERN_ERR "AUDIO pnp configure failure: %d\n", err);
-                kfree(cfg);
                 return err;
         }
 
@@ -1756,15 +1722,6 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
 
         pdev = chip->devmpu;
         if (pdev && mpu_port > 0) {
-                pnp_init_resource_table(cfg);
-
-                if (mpu_port != SNDRV_AUTO_PORT)
-                        pnp_resource_change(&cfg->port_resource[0], mpu_port, 2);
-                if (mpu_irq != SNDRV_AUTO_IRQ)
-                        pnp_resource_change(&cfg->irq_resource[0], mpu_irq, 1);
-
-                if (pnp_manual_config_dev(pdev, cfg, 0) < 0)
-                        snd_printk(KERN_ERR "AUDIO the requested resources are invalid, using auto config\n");
                 err = pnp_activate_dev(pdev);
                 if (err < 0) {
                         snd_printk(KERN_ERR "AUDIO pnp configure failure\n");
@@ -1775,7 +1732,6 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
                         mpu_irq = pnp_irq(pdev, 0);
                 }
         }
-        kfree(cfg);
         return pid->driver_data;
 }
 #endif  /* CONFIG_PNP */