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

Commit cebd78a8 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

Fix pci_claim_resource 



Instead of starting from the iomem or ioport roots, start from the
parent bus' resources.  This fixes a bug where child resources would
appear above their parents resources if they had the same size.

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Tested-by: default avatarAndrew Patterson <andrew.patterson@hp.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7cc47662

drivers/pci/setup-res.c

+2 −2
Original line number Diff line number Diff line
@@ -99,11 +99,11 @@ void pci_update_resource(struct pci_dev *dev, int resno) 
int pci_claim_resource(struct pci_dev *dev, int resource)

{

	struct resource *res = &dev->resource[resource];

	struct resource *root = NULL;

	struct resource *root;

	char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";

	int err;



	root = pcibios_select_root(dev, res);

	root = pci_find_parent_resource(dev, res);



	err = -EINVAL;

	if (root != NULL)