diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 07:22:04 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 07:22:04 +0400 |
| commit | 9d81a782d55bdeec3bfa3106e514bf46ac12e172 (patch) | |
| tree | 1b0a77dc95909331eef87a1067c01830bfc6a9c0 /drivers/video | |
| parent | 82b6c3af0482c167fb3bb51375589e6d9c5c67a4 (diff) | |
| parent | f84fcb06a1f7ab4ac0444ece82b25b0701369641 (diff) | |
| download | linux-9d81a782d55bdeec3bfa3106e514bf46ac12e172.tar.xz | |
Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6
* 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
Remove unnecessary check in drivers/video/intelfb/intelfbhw.c
intel fb: switch to pci_get API
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index eeeeff9a09eb..a95836839e1e 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: @@ -662,7 +664,7 @@ intelfbhw_print_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw) int index = dinfo->pll_index; DBG_MSG("intelfbhw_print_hw_state\n"); - if (!hw || !dinfo) + if (!hw) return; /* Read in as much of the HW state as possible. */ printk("hw state dump start\n"); |