1 files changed, 2 insertions, 34 deletions

diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 59af9ab7191f..125f6994bfb1 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -610,39 +610,8 @@ static int snd_opl3sa2_resume(struct snd_card *card)
 static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
                                      struct pnp_dev *pdev)
 {
-        struct pnp_resource_table * cfg;
-        int err;
-
-        cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
-        if (!cfg) {
-                snd_printk(KERN_ERR PFX "cannot allocate pnp cfg\n");
-                return -ENOMEM;
-        }
-        /* PnP initialization */
-        pnp_init_resource_table(cfg);
-        if (sb_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[0], sb_port[dev], 16);
-        if (wss_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[1], wss_port[dev], 8);
-        if (fm_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[2], fm_port[dev], 4);
-        if (midi_port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[3], midi_port[dev], 2);
-        if (port[dev] != SNDRV_AUTO_PORT)
-                pnp_resource_change(&cfg->port_resource[4], port[dev], 2);
-        if (dma1[dev] != SNDRV_AUTO_DMA)
-                pnp_resource_change(&cfg->dma_resource[0], dma1[dev], 1);
-        if (dma2[dev] != SNDRV_AUTO_DMA)
-                pnp_resource_change(&cfg->dma_resource[1], dma2[dev], 1);
-        if (irq[dev] != SNDRV_AUTO_IRQ)
-                pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
-        err = pnp_manual_config_dev(pdev, cfg, 0);
-        if (err < 0)
-                snd_printk(KERN_WARNING "PnP manual resources are invalid, using auto config\n");
-        err = pnp_activate_dev(pdev);
-        if (err < 0) {
-                kfree(cfg);
-                snd_printk(KERN_ERR "PnP configure failure (out of resources?) err = %d\n", err);
+        if (pnp_activate_dev(pdev) < 0) {
+                snd_printk(KERN_ERR "PnP configure failure (out of resources?)\n");
                 return -EBUSY;
         }
         sb_port[dev] = pnp_port_start(pdev, 0);
@@ -657,7 +626,6 @@ static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
                 pnp_device_is_pnpbios(pdev) ? "BIOS" : "ISA", sb_port[dev], wss_port[dev], fm_port[dev], midi_port[dev]);
         snd_printdd("%sPnP OPL3-SA: control port=0x%lx, dma1=%i, dma2=%i, irq=%i\n",
                 pnp_device_is_pnpbios(pdev) ? "BIOS" : "ISA", port[dev], dma1[dev], dma2[dev], irq[dev]);
-        kfree(cfg);
         return 0;
 }
 #endif /* CONFIG_PNP */