Commit 2ea4adf7 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Don't assign or reassign immutable resources 



IORESOURCE_PCI_FIXED means the resource can't be moved, so if it's set,
don't bother trying to assign or reassign the resource.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 63e22924

drivers/pci/setup-res.c

+6 −0
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ int pci_assign_resource(struct pci_dev *dev, int resno) 
	resource_size_t align, size;

	int ret;



	if (res->flags & IORESOURCE_PCI_FIXED)

		return 0;



	res->flags |= IORESOURCE_UNSET;

	align = pci_resource_alignment(dev, res);

	if (!align) {
@@ -321,6 +324,9 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz 
	resource_size_t new_size;

	int ret;



	if (res->flags & IORESOURCE_PCI_FIXED)

		return 0;



	flags = res->flags;

	res->flags |= IORESOURCE_UNSET;

	if (!res->parent) {