Skip to contentSkip to conversation

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

PATCH In review Muli Ben-Yehuda 1 participant 2 messages Feb 27, 2003 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 AD1848 OSS driver build fix for 2.5.63-bk (bug #289)

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.

sound/oss/ad1848.c +2 -2
diff -Nru a/sound/oss/ad1848.c b/sound/oss/ad1848.c
@@ -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. */
 
Signature · 2 lines
Muli Ben-Yehuda
http://www.mulix.org
#1 lore raw

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

Quoted 3 lines · Muli Ben-Yehuda

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

Sorry, got my bugs and patches mixed up. For the record, this patch fixes bug #398. Tested and works fine.

Signature · 2 lines
Muli Ben-Yehuda
http://www.mulix.org