summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/setup-bus.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index aa092644808b..c80162d6aefd 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -273,13 +273,17 @@ static void reassign_resources_sorted(struct list_head *realloc_head,
align = add_res->min_align;
if (!resource_size(res)) {
resource_set_range(res, align, add_size);
- if (pci_assign_resource(dev, idx))
+ if (pci_assign_resource(dev, idx)) {
+ pci_dbg(dev,
+ "%s %pR: ignoring failure in optional allocation\n",
+ res_name, res);
reset_resource(res);
+ }
} else {
res->flags |= add_res->flags &
(IORESOURCE_STARTALIGN|IORESOURCE_SIZEALIGN);
if (pci_reassign_resource(dev, idx, add_size, align))
- pci_info(dev, "%s %pR: failed to add %llx\n",
+ pci_info(dev, "%s %pR: failed to add optional %llx\n",
res_name, res,
(unsigned long long) add_size);
}