diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 22:25:11 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-14 22:38:55 +0200 |
| commit | e9d8288871efa0d98a1d1d1f17976b5b00a0234d (patch) | |
| tree | d446e04d904afeb5bda9598ec526d9beef2c5e95 /drivers | |
| parent | PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle (diff) | |
| download | linux-e9d8288871efa0d98a1d1d1f17976b5b00a0234d.tar.xz linux-e9d8288871efa0d98a1d1d1f17976b5b00a0234d.zip | |
PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset()
After commit c82f63e411f1b58427c103bd95af2863b1c96dd1
(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: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 091ce70051e0..6df5c984a791 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -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); |