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: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 604011e047d60b9db26e40e54769aeb7a957f53e..66c4d8f4223377d6bb54849d7794fc8172b1e0a2 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -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) {