---

yaml --- r: 156175 b: refs/heads/master c: 79896cf h: refs/heads/master i: 156173: 95785a6 156171: 307e8cd 156167: 9b479fe 156159: dc27219 v: v3
git-mirror · Aug 2, 2009 · f8826c3 · f8826c3
1 parent 342172f
commit f8826c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dd8486b5cfe8048e0613334659d9252ecd1b08a
+refs/heads/master: 79896cf42f6a96d7e14f2dc3473443d68d74031d
diff --git a/trunk/drivers/pci/setup-res.c b/trunk/drivers/pci/setup-res.c
@@ -100,16 +100,16 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
 {
 	struct resource *res = &dev->resource[resource];
 	struct resource *root;
-	char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
 	int err;
 
 	root = pci_find_parent_resource(dev, res);
 
 	err = -EINVAL;
 	if (root != NULL)
-		err = insert_resource(root, res);
+		err = request_resource(root, res);
 
 	if (err) {
+		const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
 		dev_err(&dev->dev, "BAR %d: %s of %s %pR\n",
 			resource,
 			root ? "address space collision on" :