hrev54921 adds 1 changeset to branch 'master'
old head: dd3b46ac1e5274a21b3e74c6fc0e3305d9ef7ac5
new head: e73999aa57b7cf883c9b8c87e97bfe012ef7e0fc
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=e73999aa57b7+%5Edd3b46ac1e52
----------------------------------------------------------------------------
e73999aa57b7: Build fix.
[ Adrien Destugues <adrien.destugues@xxxxxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54921
Commit: e73999aa57b7cf883c9b8c87e97bfe012ef7e0fc
URL: https://git.haiku-os.org/haiku/commit/?id=e73999aa57b7
Author: Adrien Destugues <adrien.destugues@xxxxxxxxxxxxxxxxxxxxx>
Date: Tue Jan 26 20:12:21 2021 UTC
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 3 deletions(-)
src/add-ons/kernel/busses/mmc/sdhci_pci.cpp | 9 ++++++---
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp
b/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp
index c799321598..50b9e493c2 100644
--- a/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp
+++ b/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp
@@ -672,13 +672,16 @@ init_bus(device_node* node, void** bus_cookie)
return -1;
// Ignore invalid bars
- if (pciInfo.u.h0.base_register_sizes[bar] == 0)
- return -1;
-
TRACE("Register SD bus at slot %d, using bar %d\n", slot + 1, bar);
pci_info pciInfo;
pci->get_pci_info(device, &pciInfo);
+
+ if (pciInfo.u.h0.base_register_sizes[bar] == 0) {
+ ERROR("No registers to map\n");
+ return -1;
+ }
+
int msiCount = sPCIx86Module->get_msi_count(pciInfo.bus,
pciInfo.device, pciInfo.function);
TRACE("interrupts count: %d\n",msiCount);
