summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-09-13 14:10:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-09-13 14:10:17 -0700
commitb7718454f937f50f44f98c1222f5135eaef29132 (patch)
treefe053b1f1bf3b4e9f60e69be89728283638f8c18
parente936e7d4a83b5ff6b7a685722f0ba348383af68c (diff)
parentfc8c818e756991f5f50b8dfab07f970a18da2556 (diff)
downloadlwn-b7718454f937f50f44f98c1222f5135eaef29132.tar.gz
lwn-b7718454f937f50f44f98c1222f5135eaef29132.zip
Merge tag 'pci-v6.11-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
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()
-rw-r--r--drivers/pci/devres.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c
index 3780a9f9ec00..c7affbbf73ab 100644
--- 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;
}
/**