diff options
-rw-r--r-- | arch/powerpc/kernel/eeh_driver.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index 80dfe8965df9..8d14feb40f12 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c | |||
@@ -590,16 +590,10 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus) | |||
590 | eeh_ops->configure_bridge(pe); | 590 | eeh_ops->configure_bridge(pe); |
591 | eeh_pe_restore_bars(pe); | 591 | eeh_pe_restore_bars(pe); |
592 | 592 | ||
593 | /* | 593 | /* Clear frozen state */ |
594 | * If it's PHB PE, the frozen state on all available PEs should have | 594 | rc = eeh_clear_pe_frozen_state(pe, false); |
595 | * been cleared by the PHB reset. Otherwise, we unfreeze the PE and its | 595 | if (rc) |
596 | * child PEs because they might be in frozen state. | 596 | return rc; |
597 | */ | ||
598 | if (!(pe->type & EEH_PE_PHB)) { | ||
599 | rc = eeh_clear_pe_frozen_state(pe, false); | ||
600 | if (rc) | ||
601 | return rc; | ||
602 | } | ||
603 | 597 | ||
604 | /* Give the system 5 seconds to finish running the user-space | 598 | /* Give the system 5 seconds to finish running the user-space |
605 | * hotplug shutdown scripts, e.g. ifdown for ethernet. Yes, | 599 | * hotplug shutdown scripts, e.g. ifdown for ethernet. Yes, |