[PATCH][2.5] Port opl3sa2 changes from 2.4

Lightweight patch manager (patch@luckynet.dynu.com)
Mon, 3 Jun 2002 16:32:58 -0600 (MDT)


opl3sa2 didn't accept dma=0 in 2.4 due to isapnp

In a recent thread [1], someone described problems with opl3sa2 on
Linux-2.4 when dma 0 was used, since isapnp didn't support dma 0. If it's
necessary to patch this in Linux-2.5 either, please apply this one.

[1] <URL:http://marc.theaimsgroup.com/?l=linux-kernel&m=102310599324992&w=2>

--- linus-2.5/sound/oss/opl3sa2.c Mon Jun 3 06:32:51 2002
+++ thunder-2.5.20/sound/oss/opl3sa2.c Mon Jun 3 16:26:38 2002
@@ -874,8 +874,18 @@
opl3sa2_activated[card] = 1;
}
else {
+ /*
+ * isapnp.c disallows dma=0, but the opl3sa2 card itself
+ * accepts this value perfectly.
+ */
+ if (dev->ro) {
+ isapnp_resource_change(&dev->dma_resource[0], 0, 1);
+ isapnp_resource_change(&dev->dma_resource[1], 1, 1);
+ }
+ opl3sa2_state[card].activated = 1;
+
if(dev->activate(dev) < 0) {
- printk(KERN_WARNING "opl3sa2: ISA PnP activate failed\n");
+ printk(KERN_WARNING "opl3sa2: ISA PnP activate failed!\n");
opl3sa2_activated[card] = 0;
return -ENODEV;
}

-- 
Lightweight patch manager using pine. If you have any objections, tell me.

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/