Commit 804aeb48 authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Russell King

[PCI] Don't call pci_update_resource() for bridge resources.

  
Minor cleanup: don't call pci_update_resource() for bridges,
get rid of bogus "trying to set non-standard region" messages thus.
parent 18e35894
...@@ -59,9 +59,7 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) ...@@ -59,9 +59,7 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
reg = dev->rom_base_reg; reg = dev->rom_base_reg;
} else { } else {
/* Hmm, non-standard resource. */ /* Hmm, non-standard resource. */
printk("PCI: trying to set non-standard region %s/%d\n", BUG();
dev->slot_name, resno);
return;
} }
pci_write_config_dword(dev, reg, new); pci_write_config_dword(dev, reg, new);
...@@ -141,7 +139,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) ...@@ -141,7 +139,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
if (ret) { if (ret) {
printk(KERN_ERR "PCI: Failed to allocate resource %d(%lx-%lx) for %s\n", printk(KERN_ERR "PCI: Failed to allocate resource %d(%lx-%lx) for %s\n",
resno, res->start, res->end, dev->slot_name); resno, res->start, res->end, dev->slot_name);
} else { } else if (resno < PCI_BRIDGE_RESOURCES) {
pci_update_resource(dev, res, resno); pci_update_resource(dev, res, resno);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment