diff options
author | Alan Cox <alan@redhat.com> | 2007-05-08 03:39:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:32 -0400 |
commit | d37363409bacd1142c6e49edfb3e1f8b153d47dc (patch) | |
tree | 2aa26a4e06020b714192f746a11c0be4c7b7c5fb /drivers/video/nvidia/nv_setup.c | |
parent | dbe7e429fedb3fbc93b496cc1c3eb4fc28333ac0 (diff) |
nvidiafb/rivafb: switch to pci_get refcounting
Switch to pci_get refcounting APIs
[adaplas]
Fix a long-standing bug where the return value of
pci_find_slot()/pci_get_bus_and_slot() is ignored.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/nvidia/nv_setup.c')
-rw-r--r-- | drivers/video/nvidia/nv_setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c index 336ddb0d10b8..707e2c8a13ed 100644 --- a/drivers/video/nvidia/nv_setup.c +++ b/drivers/video/nvidia/nv_setup.c | |||
@@ -261,7 +261,7 @@ static void nv10GetConfig(struct nvidia_par *par) | |||
261 | } | 261 | } |
262 | #endif | 262 | #endif |
263 | 263 | ||
264 | dev = pci_find_slot(0, 1); | 264 | dev = pci_get_bus_and_slot(0, 1); |
265 | if ((par->Chipset & 0xffff) == 0x01a0) { | 265 | if ((par->Chipset & 0xffff) == 0x01a0) { |
266 | int amt = 0; | 266 | int amt = 0; |
267 | 267 | ||
@@ -276,6 +276,7 @@ static void nv10GetConfig(struct nvidia_par *par) | |||
276 | par->RamAmountKBytes = | 276 | par->RamAmountKBytes = |
277 | (NV_RD32(par->PFB, 0x020C) & 0xFFF00000) >> 10; | 277 | (NV_RD32(par->PFB, 0x020C) & 0xFFF00000) >> 10; |
278 | } | 278 | } |
279 | pci_dev_put(dev); | ||
279 | 280 | ||
280 | par->CrystalFreqKHz = (NV_RD32(par->PEXTDEV, 0x0000) & (1 << 6)) ? | 281 | par->CrystalFreqKHz = (NV_RD32(par->PEXTDEV, 0x0000) & (1 << 6)) ? |
281 | 14318 : 13500; | 282 | 14318 : 13500; |