diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2013-01-21 22:20:43 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-25 21:45:00 +0100 |
| commit | a3cb999dcfe48e234927b3a541810c15dd4a890e (patch) | |
| tree | 1090e6e6f0bb8123a042f10c7f62a45ddba9d0ff /drivers/pci | |
| parent | PCI: acpiphp: Add is_hotplug_bridge detection (diff) | |
| download | linux-a3cb999dcfe48e234927b3a541810c15dd4a890e.tar.xz linux-a3cb999dcfe48e234927b3a541810c15dd4a890e.zip | |
PCI: Add root bus children dev's res to fail list
We can stop trying according to try_number now and do not need to use
root_bus checking as stop sign.
In extreme case we could need to reallocate resource for device just
under root bus. For PCI root bus hot-add, we need to retry to assign
resources to PCI devices just under pci root bus.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 6d3591d57ea0..7e8739e25b9e 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -283,7 +283,7 @@ static void assign_requested_resources_sorted(struct list_head *head, idx = res - &dev_res->dev->resource[0]; if (resource_size(res) && pci_assign_resource(dev_res->dev, idx)) { - if (fail_head && !pci_is_root_bus(dev_res->dev->bus)) { + if (fail_head) { /* * if the failed res is for ROM BAR, and it will * be enabled later, don't add it to the list |