summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-10-09 09:55:33 -0400
committerTom Rini <trini@konsulko.com>2015-10-09 09:55:33 -0400
commit38ab75a2aa54b97429b2f33ff5d3c7ddcabf1456 (patch)
treee9287143caa4b230c189fb23bc49aede18281dcc
parente928fbf9c6c14ad0586076ce9c1ab9fb03c8b106 (diff)
parent7445435fb32824e0cfd05beb7013be8f84e9ee09 (diff)
downloadtalos-obmc-uboot-38ab75a2aa54b97429b2f33ff5d3c7ddcabf1456.tar.gz
talos-obmc-uboot-38ab75a2aa54b97429b2f33ff5d3c7ddcabf1456.zip
Merge git://git.denx.de/u-boot-x86
-rw-r--r--drivers/pci/pci_auto.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 41d5447f12..79f27c744b 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -185,6 +185,7 @@ void pciauto_setup_device(struct pci_controller *hose,
#ifndef CONFIG_PCI_ENUM_ONLY
/* Configure the expansion ROM address */
pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE, &header_type);
+ header_type &= 0x7f;
if (header_type != PCI_HEADER_TYPE_CARDBUS) {
rom_addr = (header_type == PCI_HEADER_TYPE_NORMAL) ?
PCI_ROM_ADDRESS : PCI_ROM_ADDRESS1;
OpenPOWER on IntegriCloud