Fairly self explanatory. Keep a reference initially, drop it when we
free up the driver resources.
Signed-off-by: Alan Cox <[email protected]>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/drivers/mtd/maps/esb2rom.c linux-2.6.19-rc1-mm1/drivers/mtd/maps/esb2rom.c
--- linux.vanilla-2.6.19-rc1-mm1/drivers/mtd/maps/esb2rom.c 2006-10-13 15:10:06.000000000 +0100
+++ linux-2.6.19-rc1-mm1/drivers/mtd/maps/esb2rom.c 2006-10-14 21:32:12.000000000 +0100
@@ -140,8 +140,8 @@
window->virt = NULL;
window->phys = 0;
window->size = 0;
- window->pdev = NULL;
}
+ pci_dev_put(window->pdev);
}
static int __devinit esb2rom_init_one(struct pci_dev *pdev,
@@ -164,7 +164,7 @@
* Also you can page firmware hubs if an 8MB window isn't enough
* but don't currently handle that case either.
*/
- window->pdev = pdev;
+ window->pdev = pci_dev_get(pdev);
/* RLG: experiment 2. Force the window registers to the widest values */
@@ -418,7 +418,7 @@
pdev = NULL;
for (id = esb2rom_pci_tbl; id->vendor; id++) {
printk(KERN_DEBUG "device id = %x\n", id->device);
- pdev = pci_find_device(id->vendor, id->device, NULL);
+ pdev = pci_get_device(id->vendor, id->device, NULL);
if (pdev) {
printk(KERN_DEBUG "matched device = %x\n", id->device);
break;
@@ -427,6 +427,7 @@
if (pdev) {
printk(KERN_DEBUG "matched device id %x\n", id->device);
retVal = esb2rom_init_one(pdev, &esb2rom_pci_tbl[0]);
+ pci_dev_put(pdev);
printk(KERN_DEBUG "retVal = %d\n", retVal);
return retVal;
}
-
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]
