On Wed, 2005-04-13 at 15:02 -0700, Ashok Raj wrote:
> On Wed, Apr 13, 2005 at 02:31:43PM -0700, Bjorn Helgaas wrote:
> >
> > Call pci_enable_device() before looking at IRQ and resources.
> > The driver requires this fix or the "pci=routeirq" workaround
> > on 2.6.10 and later kernels.
> the failure cases dont seem to worry about pci_disable_device()?
> in err_release_ram: etc?
True. The failure paths were broken before, but here's a
revised patch that adds pci_disable_device() to them as
well. Artur has tested this patch, too.
Call pci_enable_device() before looking at IRQ and resources.
The driver requires this fix or the "pci=routeirq" workaround
on 2.6.10 and later kernels.
Reported and tested by Artur Lipowski.
Signed-off-by: Bjorn Helgaas <[email protected]>
===== drivers/net/wan/pc300_drv.c 1.24 vs edited =====
--- 1.24/drivers/net/wan/pc300_drv.c 2004-12-29 12:25:16 -07:00
+++ edited/drivers/net/wan/pc300_drv.c 2005-04-13 16:14:19 -06:00
@@ -3427,7 +3427,7 @@
{
static int first_time = 1;
ucchar cpc_rev_id;
- int err = 0, eeprom_outdated = 0;
+ int err, eeprom_outdated = 0;
ucshort device_id;
pc300_t *card;
@@ -3439,15 +3439,21 @@
#endif
}
+ if ((err = pci_enable_device(pdev)) < 0)
+ return err;
+
card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
if (card == NULL) {
printk("PC300 found at RAM 0x%08lx, "
"but could not allocate card structure.\n",
pci_resource_start(pdev, 3));
- return -ENOMEM;
+ err = -ENOMEM;
+ goto err_disable_dev;
}
memset(card, 0, sizeof(pc300_t));
+ err = -ENODEV;
+
/* read PCI configuration area */
device_id = ent->device;
card->hw.irq = pdev->irq;
@@ -3507,7 +3513,6 @@
printk("PC300 found at RAM 0x%08x, "
"but could not allocate PLX mem region.\n",
card->hw.ramphys);
- err = -ENODEV;
goto err_release_io;
}
if (!request_mem_region(card->hw.ramphys, card->hw.alloc_ramsize,
@@ -3515,7 +3520,6 @@
printk("PC300 found at RAM 0x%08x, "
"but could not allocate RAM mem region.\n",
card->hw.ramphys);
- err = -ENODEV;
goto err_release_plx;
}
if (!request_mem_region(card->hw.scaphys, card->hw.scasize,
@@ -3523,13 +3527,9 @@
printk("PC300 found at RAM 0x%08x, "
"but could not allocate SCA mem region.\n",
card->hw.ramphys);
- err = -ENODEV;
goto err_release_ram;
}
- if ((err = pci_enable_device(pdev)) != 0)
- goto err_release_sca;
-
card->hw.plxbase = ioremap(card->hw.plxphys, card->hw.plxsize);
card->hw.rambase = ioremap(card->hw.ramphys, card->hw.alloc_ramsize);
card->hw.scabase = ioremap(card->hw.scaphys, card->hw.scasize);
@@ -3619,7 +3619,6 @@
iounmap(card->hw.falcbase);
release_mem_region(card->hw.falcphys, card->hw.falcsize);
}
-err_release_sca:
release_mem_region(card->hw.scaphys, card->hw.scasize);
err_release_ram:
release_mem_region(card->hw.ramphys, card->hw.alloc_ramsize);
@@ -3628,7 +3627,9 @@
err_release_io:
release_region(card->hw.iophys, card->hw.iosize);
kfree(card);
- return -ENODEV;
+err_disable_dev:
+ pci_disable_device(pdev);
+ return err;
}
static void __devexit cpc_remove_one(struct pci_dev *pdev)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
