Merge branch 'pci/reset'

bjorn-helgaas · bjorn-helgaas · commit df1158611906 · 2025-06-04T10:50:02.000-05:00
- Fix locking issue in the slot reset path (Ilpo Järvinen)

* pci/reset:
  PCI: Fix lock symmetry in pci_slot_unlock()
diff --git 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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5524,7 +5524,8 @@ static void pci_slot_unlock(struct pci_slot *slot)`
`5524`	`5524`	`continue;`
`5525`	`5525`	`if (dev->subordinate)`
`5526`	`5526`	`pci_bus_unlock(dev->subordinate);`
`5527`		`- pci_dev_unlock(dev);`
	`5527`	`+ else`
	`5528`	`+ pci_dev_unlock(dev);`
`5528`	`5529`	`}`
`5529`	`5530`	`}`
`5530`	`5531`