From: Bjorn Helgaas Date: Mon, 22 Mar 2010 22:34:05 +0000 (-0600) Subject: PCI: don't say we claimed a resource if we failed X-Git-Tag: v2.6.34-rc3~18^2~4 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f967a44343e407811898ddac97abc69b293e9810;p=net-next-2.6.git PCI: don't say we claimed a resource if we failed pci_claim_resource() can fail, so pay attention and only claim success when it actually succeeded. If pci_claim_resource() fails, it prints a useful diagnostic. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes --- diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index f6bbb9c89e3..3ea0b29c010 100644 --- a/drivers/pci/quirks.c +++ b/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); } }