Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d81a782 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 82b6c3af f84fcb06

drivers/video/intelfb/intelfbhw.c

+4 −2
Original line number Diff line number Diff line
@@ -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");