Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9d82888 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset() 



After commit c82f63e4
(PCI: check saved state before restore) pcie_portdrv_slot_reset()
may not work correctly if dev->error_state is equal to
pci_channel_io_frozen, because dev->state_saved need not be set at
that time.  Fix this issue by setting dev->state_saved before
pci_restore_state() is called in pcie_portdrv_slot_reset().

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 7f538669

drivers/pci/pcie/portdrv_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) 


	/* If fatal, restore cfg space for possible link reset at upstream */

	if (dev->error_state == pci_channel_io_frozen) {

		dev->state_saved = true;

		pci_restore_state(dev);

		pcie_portdrv_restore_config(dev);

		pci_enable_pcie_error_reporting(dev);