Loading arch/mips/pci/pci.c +5 −2 Original line number Original line Diff line number Diff line Loading @@ -183,7 +183,9 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) (!(r->flags & IORESOURCE_ROM_ENABLE))) (!(r->flags & IORESOURCE_ROM_ENABLE))) continue; continue; if (!r->start && r->end) { if (!r->start && r->end) { 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; return -EINVAL; } } if (r->flags & IORESOURCE_IO) if (r->flags & IORESOURCE_IO) Loading @@ -192,7 +194,8 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) cmd |= PCI_COMMAND_MEMORY; cmd |= PCI_COMMAND_MEMORY; } } if (cmd != old_cmd) { if (cmd != old_cmd) { printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } } return 0; return 0; Loading Loading
arch/mips/pci/pci.c +5 −2 Original line number Original line Diff line number Diff line Loading @@ -183,7 +183,9 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) (!(r->flags & IORESOURCE_ROM_ENABLE))) (!(r->flags & IORESOURCE_ROM_ENABLE))) continue; continue; if (!r->start && r->end) { if (!r->start && r->end) { 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; return -EINVAL; } } if (r->flags & IORESOURCE_IO) if (r->flags & IORESOURCE_IO) Loading @@ -192,7 +194,8 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) cmd |= PCI_COMMAND_MEMORY; cmd |= PCI_COMMAND_MEMORY; } } if (cmd != old_cmd) { if (cmd != old_cmd) { printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } } return 0; return 0; Loading