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

Commit 5794dbcb authored by Linas Vepstas's avatar Linas Vepstas Committed by Paul Mackerras
Browse files

[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: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 90fdd613

arch/powerpc/platforms/pseries/eeh_driver.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}