Commit b7718454 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents e936e7d4 fc8c818e

drivers/pci/devres.c

+2 −0
Original line number Diff line number Diff line
@@ -483,6 +483,8 @@ static void pcim_disable_device(void *pdev_raw) 


	if (!pdev->pinned)

		pci_disable_device(pdev);



	pdev->is_managed = false;

}



/**