Commit e1b89c50 authored by Muli Ben-Yehuda's avatar Muli Ben-Yehuda Committed by Linus Torvalds

[PATCH] AD1848 OSS driver build fix

This patch fixes bugzilla bug #398,
http://bugme.osdl.org/show_bug.cgi?id=398, PNP API breakage in the
ad1848 sound driver.
parent 5845c707
...@@ -2987,7 +2987,7 @@ static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev ...@@ -2987,7 +2987,7 @@ static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev
if (err < 0) if (err < 0)
return(NULL); 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); printk(KERN_ERR "ad1848: %s %s config failed (out of resources?)[%d]\n", devname, resname, err);
pnp_device_detach(dev); pnp_device_detach(dev);
...@@ -3024,7 +3024,7 @@ static struct pnp_dev *ad1848_init_generic(struct pnp_card *bus, struct address_ ...@@ -3024,7 +3024,7 @@ static struct pnp_dev *ad1848_init_generic(struct pnp_card *bus, struct address_
static int __init ad1848_isapnp_init(struct address_info *hw_config, struct pnp_card *bus, int slot) 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. */ /* Initialize this baby. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment