From: Linas Vepstas Date: Mon, 19 Mar 2007 19:55:51 +0000 (-0500) Subject: [POWERPC] EEH: multifunction recovery bugfix X-Git-Tag: MMI-PSA29.97-13-9~44252^2~155 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5794dbcbab862e416c4ea4f10fda5e67f5565fd7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [POWERPC] EEH: multifunction recovery bugfix If the second or higher function of a multi-function device fails to recover, this failure is not reported upwards. Fix this. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index d73c297b0234..5ec6edf19ece 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c @@ -158,7 +158,8 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata) return; rc = driver->err_handler->slot_reset(dev); - if (*res == PCI_ERS_RESULT_NONE) *res = rc; + if ((*res == PCI_ERS_RESULT_NONE) || + (*res == PCI_ERS_RESULT_RECOVERED)) *res = rc; if (*res == PCI_ERS_RESULT_DISCONNECT && rc == PCI_ERS_RESULT_NEED_RESET) *res = rc; }