diff options
| author | Con Kolivas <kernel@kolivas.org> | 2016-12-12 10:56:17 +1100 |
|---|---|---|
| committer | Con Kolivas <kernel@kolivas.org> | 2016-12-12 10:56:17 +1100 |
| commit | c3e1d5cbf048128fa788513fbc5fa3036c85fcb0 (patch) | |
| tree | 4b2b38cc960963abc48b2e30c6e2415ee383c98d /arch/powerpc/kernel/eeh_driver.c | |
| parent | e4d2e01f84338d948be51202038842fe3e0f6ce9 (diff) | |
| parent | 69973b830859bc6529a7a0468ba0d80ee5117826 (diff) | |
Merge tag 'v4.9' into 4.9-muqss4.9-muqss-150
Linux 4.9
Diffstat (limited to 'arch/powerpc/kernel/eeh_driver.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh_driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index a62be72da274..5c31369435f2 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -671,8 +671,10 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, /* Clear frozen state */ rc = eeh_clear_pe_frozen_state(pe, false); - if (rc) + if (rc) { + pci_unlock_rescan_remove(); return rc; + } /* Give the system 5 seconds to finish running the user-space * hotplug shutdown scripts, e.g. ifdown for ethernet. Yes, |