diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 06:00:02 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 06:00:02 +0200 |
| commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
| tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /drivers/pci/setup-res.c | |
| parent | sh: Runtime PM pdev hwblk - Solution Engine 7724 (diff) | |
| parent | Merge branch 'sh/stable-updates' (diff) | |
| download | linux-4b6b987969b076298485697bfb0d0e35502642a3.tar.xz linux-4b6b987969b076298485697bfb0d0e35502642a3.zip | |
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'drivers/pci/setup-res.c')
| -rw-r--r-- | drivers/pci/setup-res.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index b711fb7181e2..1898c7b47907 100644 --- a/drivers/pci/setup-res.c +++ b/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" : |