[MIPS] PCI: Port i386 PCI fixes.

The MIPS version of pcibios_enalbe_resources did not have the fixes
from ed6d14f9760857c745206c978b80352fc09cfd19 yet which under circumstances
similar to x86 might result in failures.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 6e6981fd7934..1d10d6544152 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -177,6 +177,11 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
                         continue;
 
                 r = &dev->resource[idx];
+                if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+                        continue;
+                if ((idx == PCI_ROM_RESOURCE) &&
+                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
+                        continue;
                 if (!r->start && r->end) {
                         printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
                         return -EINVAL;
@@ -186,8 +191,6 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
                 if (r->flags & IORESOURCE_MEM)
                         cmd |= PCI_COMMAND_MEMORY;
         }
-        if (dev->resource[PCI_ROM_RESOURCE].start)
-                cmd |= PCI_COMMAND_MEMORY;
         if (cmd != old_cmd) {
                 printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
                 pci_write_config_word(dev, PCI_COMMAND, cmd);