diff options
Diffstat (limited to 'drivers/pci/setup-res.c')
-rw-r--r-- | drivers/pci/setup-res.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 3c5203ff53c7..32e8d88a4619 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
@@ -31,6 +31,7 @@ void pci_update_resource(struct pci_dev *dev, int resno) | |||
31 | struct pci_bus_region region; | 31 | struct pci_bus_region region; |
32 | u32 new, check, mask; | 32 | u32 new, check, mask; |
33 | int reg; | 33 | int reg; |
34 | enum pci_bar_type type; | ||
34 | struct resource *res = dev->resource + resno; | 35 | struct resource *res = dev->resource + resno; |
35 | 36 | ||
36 | /* | 37 | /* |
@@ -62,17 +63,13 @@ void pci_update_resource(struct pci_dev *dev, int resno) | |||
62 | else | 63 | else |
63 | mask = (u32)PCI_BASE_ADDRESS_MEM_MASK; | 64 | mask = (u32)PCI_BASE_ADDRESS_MEM_MASK; |
64 | 65 | ||
65 | if (resno < 6) { | 66 | reg = pci_resource_bar(dev, resno, &type); |
66 | reg = PCI_BASE_ADDRESS_0 + 4 * resno; | 67 | if (!reg) |
67 | } else if (resno == PCI_ROM_RESOURCE) { | 68 | return; |
69 | if (type != pci_bar_unknown) { | ||
68 | if (!(res->flags & IORESOURCE_ROM_ENABLE)) | 70 | if (!(res->flags & IORESOURCE_ROM_ENABLE)) |
69 | return; | 71 | return; |
70 | new |= PCI_ROM_ADDRESS_ENABLE; | 72 | new |= PCI_ROM_ADDRESS_ENABLE; |
71 | reg = dev->rom_base_reg; | ||
72 | } else { | ||
73 | /* Hmm, non-standard resource. */ | ||
74 | |||
75 | return; /* kill uninitialised var warning */ | ||
76 | } | 73 | } |
77 | 74 | ||
78 | pci_write_config_dword(dev, reg, new); | 75 | pci_write_config_dword(dev, reg, new); |