summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2025-06-04 10:50:02 -0500
committerBjorn Helgaas <bhelgaas@google.com>2025-06-04 10:50:02 -0500
commitdf11586119066c0c37c4324c3866416fe72c3f1a (patch)
treedacc2253dcee23a747a65d42e8da76cb27676323
parent4dac48e8a755c03f07d3cb10ae605f620eaee4d3 (diff)
parentf3efb9569b4a21354ef2caf7ab0608a3e14cc6e4 (diff)
Merge branch 'pci/reset'
- Fix locking issue in the slot reset path (Ilpo Järvinen) * pci/reset: PCI: Fix lock symmetry in pci_slot_unlock()
-rw-r--r--drivers/pci/pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index da6bb9ef6dfc..b4f04b0456eb 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5524,7 +5524,8 @@ static void pci_slot_unlock(struct pci_slot *slot)
continue;
if (dev->subordinate)
pci_bus_unlock(dev->subordinate);
- pci_dev_unlock(dev);
+ else
+ pci_dev_unlock(dev);
}
}