Message ID | 20090617134311.GR19977@parisc-linux.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Wed, 17 Jun 2009, Matthew Wilcox wrote: > > Anyway, this should fix pci_claim_resource (untested): Ack. This looks very sane. I'll happily commit this, but would be even happier to hear that it got some testing too, so I'll hold off for a while. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 3039fcb..1240351 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -99,11 +99,11 @@ void pci_update_resource(struct pci_dev *dev, int resno) int pci_claim_resource(struct pci_dev *dev, int resource) { struct resource *res = &dev->resource[resource]; - struct resource *root = NULL; + struct resource *root; char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge"; int err; - root = pcibios_select_root(dev, res); + root = pci_find_parent_resource(dev, res); err = -EINVAL; if (root != NULL)