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

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

[Muli Ben-Yehuda]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

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


[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

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

[Muli Ben-Yehuda]

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

On Thu, Feb 27, 2003 at 04:53:18PM +0200, Muli Ben-Yehuda wrote:

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


[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]