diff options
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/pci_device.c | 9 | ||||
| -rw-r--r-- | src/devices/pci_rom.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index 0e7a5df487..c816ae0b2c 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -10,7 +10,8 @@ * Copyright (C) 2004-2005 Li-Ta Lo <ollie@lanl.gov> * Copyright (C) 2005-2006 Tyan * (Written by Yinghai Lu <yhlu@tyan.com> for Tyan) - * Copyright (C) 2005-2007 Stefan Reinauer <stepan@openbios.org> + * Copyright (C) 2005-2009 coresystems GmbH + * (Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH) */ /* @@ -271,7 +272,7 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) { struct resource *resource; unsigned long value; - resource_t moving, limit; + resource_t moving; if ((dev->on_mainboard) && (dev->rom_address == 0)) { //skip it if rom_address is not set in MB Config.lb @@ -296,8 +297,6 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) * - Limit is all of the bits that move plus all of the lower bits. * See PCI Spec 6.2.5.1 ... */ - limit = 0; - if (moving) { resource->size = 1; resource->align = resource->gran = 0; @@ -306,7 +305,7 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) resource->align += 1; resource->gran += 1; } - resource->limit = limit = moving | (resource->size - 1); + resource->limit = moving | (resource->size - 1); } if (moving == 0) { diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index 5df13a4214..e628161cf6 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -42,7 +42,7 @@ struct rom_header * pci_rom_probe(struct device *dev) printk_debug("In cbfs, rom address for %s = %lx\n", dev_path(dev), rom_address); if (v) { - dev->rom_address = v; + dev->rom_address = (u32)v; dev->on_mainboard = 1; } } |