1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 1ba84be0b4c0..c1bdfb424658 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -72,7 +72,10 @@ pbus_assign_resources_sorted(struct pci_bus *bus)
         for (list = head.next; list;) {
                 res = list->res;
                 idx = res - &list->dev->resource[0];
-                pci_assign_resource(list->dev, idx);
+                if (pci_assign_resource(list->dev, idx)) {
+                        res->start = 0;
+                        res->flags = 0;
+                }
                 tmp = list;
                 list = list->next;
                 kfree(tmp);
@@ -270,6 +273,8 @@ find_free_bus_resource(struct pci_bus *bus, unsigned long type)
 
         for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
                 r = bus->resource[i];
+                if (r == &ioport_resource || r == &iomem_resource)
+                        continue;
                 if (r && (r->flags & type_mask) == type && !r->parent)
                         return r;
         }