diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:38:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:38:16 -0700 |
| commit | 98b96173c777c67daaa7d163a35e591e1928a164 (patch) | |
| tree | 0530429db1328a00b89972ca67d15e1b61e66ba8 /drivers/char/agp/nvidia-agp.c | |
| parent | cf8ba7a95511b86608acb481ad96219fe2da4b3a (diff) | |
| parent | 881ba59d4685b28433bf313b6db51672a02696a3 (diff) | |
| download | talos-op-linux-98b96173c777c67daaa7d163a35e591e1928a164.tar.gz talos-op-linux-98b96173c777c67daaa7d163a35e591e1928a164.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] sworks-agp: Switch to PCI ref counting APIs
[AGPGART] Nvidia AGP: Use refcount aware PCI interfaces
[AGPGART] Fix sparse warning in sgi-agp.c
[AGPGART] Intel-agp adjustments
[AGPGART] Move [un]map_page_into_agp into asm/agp.h
[AGPGART] Add missing calls to global_flush_tlb() to ali-agp
[AGPGART] prevent probe collision of sis-agp and amd64_agp
Diffstat (limited to 'drivers/char/agp/nvidia-agp.c')
| -rw-r--r-- | drivers/char/agp/nvidia-agp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c index 0c9dab557c94..6cd7373dcdf4 100644 --- a/drivers/char/agp/nvidia-agp.c +++ b/drivers/char/agp/nvidia-agp.c @@ -320,11 +320,11 @@ static int __devinit agp_nvidia_probe(struct pci_dev *pdev, u8 cap_ptr; nvidia_private.dev_1 = - pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 1)); + pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 1)); nvidia_private.dev_2 = - pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 2)); + pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 2)); nvidia_private.dev_3 = - pci_find_slot((unsigned int)pdev->bus->number, PCI_DEVFN(30, 0)); + pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(30, 0)); if (!nvidia_private.dev_1 || !nvidia_private.dev_2 || !nvidia_private.dev_3) { printk(KERN_INFO PFX "Detected an NVIDIA nForce/nForce2 " @@ -443,6 +443,9 @@ static int __init agp_nvidia_init(void) static void __exit agp_nvidia_cleanup(void) { pci_unregister_driver(&agp_nvidia_pci_driver); + pci_dev_put(nvidia_private.dev_1); + pci_dev_put(nvidia_private.dev_2); + pci_dev_put(nvidia_private.dev_3); } module_init(agp_nvidia_init); |
