diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-26 22:11:28 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-26 22:11:28 -0400 |
| commit | 60cfff3516580f5c782cef4dc28f2974c4df8ed1 (patch) | |
| tree | 30053bcf09c1b77699281ba3a56d8ffb4144966c /drivers/pci | |
| parent | 89ef1a21a174a4f581a4b6973f9a9f9ee28a9304 (diff) | |
| parent | 212d6d2237f60bc28c1518f8abf9d3ed6c17574a (diff) | |
| download | op-kernel-dev-60cfff3516580f5c782cef4dc28f2974c4df8ed1.zip op-kernel-dev-60cfff3516580f5c782cef4dc28f2974c4df8ed1.tar.gz | |
Auto-update from upstream
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 | ||||
| -rw-r--r-- | drivers/pci/setup-res.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index a2eebc6..6d864c5 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -40,7 +40,7 @@ * FIXME: IO should be max 256 bytes. However, since we may * have a P2P bridge below a cardbus bridge, we need 4K. */ -#define CARDBUS_IO_SIZE (4096) +#define CARDBUS_IO_SIZE (256) #define CARDBUS_MEM_SIZE (32*1024*1024) static void __devinit diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 84eedc9..5598b47 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -53,7 +53,9 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) if (resno < 6) { reg = PCI_BASE_ADDRESS_0 + 4 * resno; } else if (resno == PCI_ROM_RESOURCE) { - new |= res->flags & IORESOURCE_ROM_ENABLE; + if (!(res->flags & IORESOURCE_ROM_ENABLE)) + return; + new |= PCI_ROM_ADDRESS_ENABLE; reg = dev->rom_base_reg; } else { /* Hmm, non-standard resource. */ |
