diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:26 -0400 |
| commit | 20445cc9159089d9d6b88d7864578efb10eb6590 (patch) | |
| tree | fbbb27fd8baa82c77ebc4e020e8ee9ddb57e3ae2 /drivers/pci/setup-res.c | |
| parent | 4339d328631aa815fe2181b9164b3690ca2db4da (diff) | |
| parent | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (diff) | |
| download | linux-next-20445cc9159089d9d6b88d7864578efb10eb6590.tar.gz | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/pci/setup-res.c')
| -rw-r--r-- | drivers/pci/setup-res.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 1ca21d2ba11c..84eedc965688 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -33,6 +33,11 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) u32 new, check, mask; int reg; + /* Ignore resources for unimplemented BARs and unused resource slots + for 64 bit BARs. */ + if (!res->flags) + return; + pcibios_resource_to_bus(dev, ®ion, res); pr_debug(" got res [%lx:%lx] bus [%lx:%lx] flags %lx for " @@ -67,7 +72,7 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) if ((new & (PCI_BASE_ADDRESS_SPACE|PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64)) { - new = 0; /* currently everyone zeros the high address */ + new = region.start >> 16 >> 16; pci_write_config_dword(dev, reg + 4, new); pci_read_config_dword(dev, reg + 4, &check); if (check != new) { |