|
@@ -530,10 +530,16 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
|
|
|
|
|
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
|
|
old_cmd = cmd;
|
|
|
- for (idx=0; idx<6; idx++) {
|
|
|
+ for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
|
|
|
+ /* Only set up the requested stuff */
|
|
|
+ if (!(mask & (1 << idx)))
|
|
|
+ continue;
|
|
|
r = &dev->resource[idx];
|
|
|
+ if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
|
|
+ continue;
|
|
|
if (r->flags & IORESOURCE_UNSET) {
|
|
|
- printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
|
|
|
+ printk(KERN_ERR "PCI: Device %s not available because"
|
|
|
+ " of resource collisions\n", pci_name(dev));
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
if (r->flags & IORESOURCE_IO)
|