]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
x86: Return -1 when reading a PCI config register fails
authorSimon Glass <sjg@chromium.org>
Thu, 13 Aug 2015 02:09:30 +0000 (20:09 -0600)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 08:23:21 +0000 (10:23 +0200)
This can fail for internal reasons, so return a sensible value rather than
a random one.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
arch/x86/cpu/pci.c

index f8da08035e62bbcfd5454682bfa5b03fbeca19a9..d2ec45a2403cba00839ed68378838407e153d303 100644 (file)
@@ -76,7 +76,8 @@ unsigned int x86_pci_read_config8(pci_dev_t dev, unsigned where)
 {
        uint8_t value;
 
-       pci_hose_read_config_byte(get_hose(), dev, where, &value);
+       if (pci_hose_read_config_byte(get_hose(), dev, where, &value))
+               return -1U;
 
        return value;
 }
@@ -85,7 +86,8 @@ unsigned int x86_pci_read_config16(pci_dev_t dev, unsigned where)
 {
        uint16_t value;
 
-       pci_hose_read_config_word(get_hose(), dev, where, &value);
+       if (pci_hose_read_config_word(get_hose(), dev, where, &value))
+               return -1U;
 
        return value;
 }
@@ -94,7 +96,8 @@ unsigned int x86_pci_read_config32(pci_dev_t dev, unsigned where)
 {
        uint32_t value;
 
-       pci_hose_read_config_dword(get_hose(), dev, where, &value);
+       if (pci_hose_read_config_dword(get_hose(), dev, where, &value))
+               return -1U;
 
        return value;
 }