diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-10-20 14:36:00 -0700 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-10-25 12:05:18 -0700 |
| commit | a77b8950019289611f836c8fc19f91592822efcd (patch) | |
| tree | 8d61bff30032504a3f8387daf8c5262167c04772 | |
| parent | 9eed28679282238210ad5e80bb91df30fec6d7db (diff) | |
| download | op-kernel-dev-a77b8950019289611f836c8fc19f91592822efcd.zip op-kernel-dev-a77b8950019289611f836c8fc19f91592822efcd.tar.gz | |
intel fb: switch to pci_get API
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
| -rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index eeeeff9..eae60f9 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c @@ -161,7 +161,7 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size, return 1; /* Find the bridge device. It is always 0:0.0 */ - if (!(bridge_dev = pci_find_slot(0, PCI_DEVFN(0, 0)))) { + if (!(bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)))) { ERR_MSG("cannot find bridge device\n"); return 1; } @@ -169,6 +169,8 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size, /* Get the fb aperture size and "stolen" memory amount. */ tmp = 0; pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &tmp); + pci_dev_put(bridge_dev); + switch (pdev->device) { case PCI_DEVICE_ID_INTEL_915G: case PCI_DEVICE_ID_INTEL_915GM: |
