diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2004-09-23 04:24:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-23 04:24:13 -0700 |
| commit | 0dd3a3bc9416ce0219ba9f083ec2b741eb79c6c4 (patch) | |
| tree | a0a22c6a30a719673a9e57cbfef4eac1ac138cd2 | |
| parent | 0775cc5c276cf9c203717091c3ca51e1c6566c9a (diff) | |
[PATCH] ppc32: Fix typo/bug in bus resource allocation
The code re-allocating new bus resources in case of conflicts use a
function called probe_resource(), which has a typo (spotted by the
uninitialized variable use of gcc) causing it to potentially return
bogus results. This fixes it:
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/ppc/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index a6d2a831e9fe..d51e3de8de12 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c @@ -412,7 +412,7 @@ probe_resource(struct pci_bus *parent, struct resource *pr, r = &dev->resource[i]; if (!r->flags || (r->flags & IORESOURCE_UNSET)) continue; - if (pci_find_parent_resource(bus->self, r) != pr) + if (pci_find_parent_resource(dev, r) != pr) continue; if (r->end >= res->start && res->end >= r->start) { *conflict = r; |