diff options
-rw-r--r-- | arch/mips/pci/pci.c | 7 |
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) | |||
177 | continue; | 177 | continue; |
178 | 178 | ||
179 | r = &dev->resource[idx]; | 179 | r = &dev->resource[idx]; |
180 | if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) | ||
181 | continue; | ||
182 | if ((idx == PCI_ROM_RESOURCE) && | ||
183 | (!(r->flags & IORESOURCE_ROM_ENABLE))) | ||
184 | continue; | ||
180 | if (!r->start && r->end) { | 185 | if (!r->start && r->end) { |
181 | printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); | 186 | printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); |
182 | return -EINVAL; | 187 | return -EINVAL; |
@@ -186,8 +191,6 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) | |||
186 | if (r->flags & IORESOURCE_MEM) | 191 | if (r->flags & IORESOURCE_MEM) |
187 | cmd |= PCI_COMMAND_MEMORY; | 192 | cmd |= PCI_COMMAND_MEMORY; |
188 | } | 193 | } |
189 | if (dev->resource[PCI_ROM_RESOURCE].start) | ||
190 | cmd |= PCI_COMMAND_MEMORY; | ||
191 | if (cmd != old_cmd) { | 194 | if (cmd != old_cmd) { |
192 | printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); | 195 | printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); |
193 | pci_write_config_word(dev, PCI_COMMAND, cmd); | 196 | pci_write_config_word(dev, PCI_COMMAND, cmd); |