diff options
| author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2002-05-28 03:04:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-28 03:04:43 -0700 |
| commit | 5ff8f2bb405a6018e26560c16606d17234a6397e (patch) | |
| tree | 49e04e3e2cb17cdbe3e3332304537110c5b251fe | |
| parent | 79569bfe3f1bb52713b1123005d0ca479bb280d2 (diff) | |
[PATCH] 2.5.18 pci/setup-bus.c: incorrect BUG() calls
Previously assigned resources are perfectly valid - just silently
ignore them.
| -rw-r--r-- | drivers/pci/setup-bus.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 0e520ab1a3ca..efa7fdded2c9 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -228,10 +228,8 @@ pbus_size_io(struct pci_bus *bus) struct resource *r = &dev->resource[i]; unsigned long r_size; - if (!(r->flags & IORESOURCE_IO)) + if (r->parent || !(r->flags & IORESOURCE_IO)) continue; - if (r->parent) - BUG(); r_size = r->end - r->start + 1; if (r_size < 0x400) @@ -283,10 +281,8 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type) struct resource *r = &dev->resource[i]; unsigned long r_size; - if ((r->flags & mask) != type) + if (r->parent || (r->flags & mask) != type) continue; - if (r->parent) - BUG(); r_size = r->end - r->start + 1; /* For bridges size != alignment */ align = (i < PCI_BRIDGE_RESOURCES) ? r_size : r->start; |