diff options
| author | Linus Torvalds <[email protected]> | 2021-09-17 18:42:31 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-09-17 18:42:31 +0000 |
| commit | 7639afad8b8d6671a645fb3d6e6fd1432dcdf6ac (patch) | |
| tree | ebeb416d7839d8d2601fa5956695741179479011 /drivers/pci/pci-acpi.c | |
| parent | Merge tag 'iov_iter.3-5.15-2021-09-17' of git://git.kernel.dk/linux-block (diff) | |
| parent | MAINTAINERS: Add Nirmal Patel as VMD maintainer (diff) | |
| download | kernel-7639afad8b8d6671a645fb3d6e6fd1432dcdf6ac.tar.gz kernel-7639afad8b8d6671a645fb3d6e6fd1432dcdf6ac.zip | |
Merge tag 'pci-v5.15-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- Defer VPD sizing until we actually need the contents; fixes a
boot-time slowdown reported by Dave Jones (Bjorn Helgaas)
- Stop clobbering OF fwnodes when we look for an ACPI fwnode; fixes a
virtio-iommu boot regression (Jean-Philippe Brucker)
- Add AMD GPU multi-function power dependencies; fixes runtime power
management, including GPU resume and temp and fan sensor issues (Evan
Quan)
- Update VMD maintainer to Nirmal Patel (Jon Derrick)
* tag 'pci-v5.15-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
MAINTAINERS: Add Nirmal Patel as VMD maintainer
PCI: Add AMD GPU multi-function power dependencies
PCI/ACPI: Don't reset a fwnode set by OF
PCI/VPD: Defer VPD sizing until first access
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index a1b1e2a01632..0f40943a9a18 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -937,7 +937,7 @@ static struct acpi_device *acpi_pci_find_companion(struct device *dev); void pci_set_acpi_fwnode(struct pci_dev *dev) { - if (!ACPI_COMPANION(&dev->dev) && !pci_dev_is_added(dev)) + if (!dev_fwnode(&dev->dev) && !pci_dev_is_added(dev)) ACPI_COMPANION_SET(&dev->dev, acpi_pci_find_companion(&dev->dev)); } |