---

yaml --- r: 189125 b: refs/heads/master c: f967a44 h: refs/heads/master i: 189123: 0a39247 v: v3
git-mirror · Mar 25, 2010 · e454e0f · e454e0f
1 parent 6b53135
commit e454e0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 134b345081534235dbf228b1005c14590e0570ba
+refs/heads/master: f967a44343e407811898ddac97abc69b293e9810
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
@@ -368,8 +368,9 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region,
 		bus_region.end = res->end;
 		pcibios_bus_to_resource(dev, res, &bus_region);
 
-		pci_claim_resource(dev, nr);
-		dev_info(&dev->dev, "quirk: %pR claimed by %s\n", res, name);
+		if (pci_claim_resource(dev, nr) == 0)
+			dev_info(&dev->dev, "quirk: %pR claimed by %s\n",
+				 res, name);
 	}
 }