aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-09-17 22:11:34 -0700
committerYinghai Lu <yinghai@kernel.org>2012-09-17 22:11:34 -0700
commitc13bdd5d3e29701b25407eb2f24f0550a46554bf (patch)
tree6c5277e26523b8b4ae974c66d03179bea5bf9744
parente9464a5e842dc96010216d46ea567be52c7c17ae (diff)
downloadlinux-yinghai-c13bdd5d3e29701b25407eb2f24f0550a46554bf.tar.gz
PCI: Add root bus children dev's res to fail list
We can stop according to try number now and do not need to use root_bus checking as stop sign anymore. Also in extreme case we could need to reallocate device just under bus 0. Signed-off-by: Yinghai Lu <yinghai@kernel.org>
-rw-r--r--drivers/pci/setup-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 1e808ca338f80..9e625d84abfa1 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