[Linux-fbdev-devel] [PATCH] intel fb: switch to pci_get API

[Alan C. <al...@lx...>]

Signed-off-by: Alan Cox <al...@re...>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/drivers/video/intelfb/intelfbhw.c linux-2.6.19-rc1-mm1/drivers/video/intelfb/intelfbhw.c
--- linux.vanilla-2.6.19-rc1-mm1/drivers/video/intelfb/intelfbhw.c	2006-10-13 15:10:07.000000000 +0100
+++ linux-2.6.19-rc1-mm1/drivers/video/intelfb/intelfbhw.c	2006-10-13 17:21:18.000000000 +0100
@@ -161,7 +161,7 @@
 		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 @@
 	/* 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: