Merge tag 'pci-v6.11-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

torvalds · torvalds · commit b7718454f937 · 2024-09-13T14:10:17.000-07:00
Pull pci fix from Bjorn Helgaas:

 - Prevent a possible deadlock (reported by lockdep) when a driver
   relinquishes a pci_dev, another driver claims it, and one uses
   managed pcim_enable_device() and the other doesn't (Philipp Stanner)

* tag 'pci-v6.11-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: Fix potential deadlock in pcim_intx()
diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c
@@ -483,6 +483,8 @@ static void pcim_disable_device(void *pdev_raw)
 
 	if (!pdev->pinned)
 		pci_disable_device(pdev);
+
+	pdev->is_managed = false;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,8 @@ static void pcim_disable_device(void *pdev_raw)`
`483`	`483`
`484`	`484`	`if (!pdev->pinned)`
`485`	`485`	`pci_disable_device(pdev);`
	`486`	`+`
	`487`	`+ pdev->is_managed = false;`
`486`	`488`	`}`
`487`	`489`
`488`	`490`	`/**`