[PATCH] AD1848 OSS driver build fix for 2.5.63-bk (bug #289)

From: Muli Ben-Yehuda (mulix@mulix.org)
Date: Thu Feb 27 2003 - 09:53:18 EST

This patch fixes bugzilla bug #289,
http://bugme.osdl.org/show_bug.cgi?id=289, PNP API breakage in the
ad1848 sound driver.

Tested and works fine. Please apply.

diff -Nru a/sound/oss/ad1848.c b/sound/oss/ad1848.c
--- a/sound/oss/ad1848.c Thu Feb 27 10:32:05 2003
+++ b/sound/oss/ad1848.c Thu Feb 27 10:32:05 2003
@@ -2987,7 +2987,7 @@
         if (err < 0)
                 return(NULL);
 
- if((err = pnp_activate_dev(dev,NULL)) < 0) {
+ if((err = pnp_activate_dev(dev)) < 0) {
                 printk(KERN_ERR "ad1848: %s %s config failed (out of resources?)[%d]\n", devname, resname, err);
 
                 pnp_device_detach(dev);
@@ -3024,7 +3024,7 @@
 
 static int __init ad1848_isapnp_init(struct address_info *hw_config, struct pnp_card *bus, int slot)
 {
- char *busname = bus->name[0] ? bus->name : ad1848_isapnp_list[slot].name;
+ char *busname = bus->dev.name[0] ? bus->dev.name : ad1848_isapnp_list[slot].name;
 
         /* Initialize this baby. */
  

-- 
Muli Ben-Yehuda
http://www.mulix.org
- 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/

This archive was generated by hypermail 2b29 : Fri Feb 28 2003 - 22:00:43 EST