Message ID | 1440138067-4314-17-git-send-email-yinghai@kernel.org |
---|---|
State | Changes Requested |
Headers | show |
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index b17ee2d..ccc6f9d 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -380,7 +380,7 @@ static void assign_requested_resources_sorted(struct list_head *head, list_for_each_entry(dev_res, head, list) { res = dev_res->res; idx = res - &dev_res->dev->resource[0]; - if (resource_size(res) && + if (!res->parent && resource_size(res) && pci_assign_resource(dev_res->dev, idx)) { if (fail_head) add_to_list(fail_head, dev_res->dev, res);
In following alt_size support, we will call pci_assign_resource() on one resource list several times, and some resources could have been assigned already. Skip allocated resource in the list, as pci_assign_resource() only can handle not assigned resource. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- drivers/pci/setup-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)