pci_enable_device_flags() and pci_enable_bridge() assume that
"bus->self == NULL" means that "bus" is a root bus. That assumption is
false; see 2ba29e270e97 ("PCI: Use pci_is_root_bus() to check for root
bus") for details.
This patch changes them to use pci_is_root_bus() instead.
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
---
drivers/pci/pci.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ac40f90..de65bf7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1150,10 +1150,8 @@ static void pci_enable_bridge(struct pci_dev *dev)
{
int retval;
- if (!dev)
- return;
-
- pci_enable_bridge(dev->bus->self);
+ if (!pci_is_root_bus(dev->bus))
+ pci_enable_bridge(dev->bus->self);
if (pci_is_enabled(dev)) {
if (!dev->is_busmaster)
@@ -1188,7 +1186,8 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
if (atomic_inc_return(&dev->enable_cnt) > 1)
return 0; /* already enabled */
- pci_enable_bridge(dev->bus->self);
+ if (!pci_is_root_bus(dev->bus))
+ pci_enable_bridge(dev->bus->self);
/* only skip sriov related */
for (i = 0; i <= PCI_ROM_RESOURCE; i++)
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
