From f8826c3cab2dce7ad6321c7d4d32853ea6b8a13d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Aug 2009 14:04:19 -0700
Subject: [PATCH] --- yaml --- r: 156175 b: refs/heads/master c:
 79896cf42f6a96d7e14f2dc3473443d68d74031d h: refs/heads/master i:   156173:
 95785a63870ee06a6423d1fcad488ace174c24e1   156171:
 307e8cd4659ae06ddf5063ecc23d38ca3429aeaa   156167:
 9b479fe6f112cf1b25f4160aa8d6e7043d96add5   156159:
 dc27219e59a7839a986ecde66408ad52f82ac14c v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/setup-res.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b952380e00c6..2db29d4485f9 100644
--- 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
index b711fb7181e2..1898c7b47907 100644
--- 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" :