Merge branch 'pci/pm'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 29 Aug 2023 16:03:49 +0000 (11:03 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 29 Aug 2023 16:03:49 +0000 (11:03 -0500)
commit95cddeae54b0ad962a8c1857b788b239556dec89
treea7886b2c26f737f4486c4dc9a406ed525276d61b
parent8b524514e49670d3ab81c7dca18fdc55d82631d4
parent5694ba13b004eea683c6d4faeb6d6e7a9636bda0
Merge branch 'pci/pm'

- Only read PCI_PM_CTRL register when available, to avoid reading the wrong
  register and corrupting dev->current_state (Feiyang Chen)

* pci/pm:
  PCI/PM: Only read PCI_PM_CTRL register when available
drivers/pci/pci.c