---

yaml --- r: 358409 b: refs/heads/master c: a3cb999 h: refs/heads/master i: 358407: 3cdc9fb v: v3
git-mirror · Jan 25, 2013 · 8e52d47 · 8e52d47
1 parent 3e6eff2
commit 8e52d47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f96a965e30d097a25818196e33d2dce923973a7
+refs/heads/master: a3cb999dcfe48e234927b3a541810c15dd4a890e
diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/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