Skip to content

Commit

Permalink
Merge tag 'pci-v6.11-fixes-4' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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()
  • Loading branch information
Linus Torvalds committed Sep 13, 2024
2 parents e936e7d + fc8c818 commit b771845
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/pci/devres.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,8 @@ static void pcim_disable_device(void *pdev_raw)

if (!pdev->pinned)
pci_disable_device(pdev);

pdev->is_managed = false;
}

/**
Expand Down

0 comments on commit b771845

Please sign in to comment.