summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2015-10-15 15:34:14 +0200
committerStefano Babic <sbabic@denx.de>2015-10-15 15:34:14 +0200
commitf74dc51bcab924a30e41b33981a4f96af3f9dd57 (patch)
tree560eead1ca9984554be3a5c9a5332b531c102cb0 /drivers/pci
parentcf04ad3219260c3c39ec3dbfe2427e3463e8dbd5 (diff)
parent297faccca2235e359012118495b9b73451d54bb9 (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/pci')
-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;