瀏覽代碼

[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 <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Linas Vepstas 18 年之前
父節點
當前提交
5794dbcbab
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      arch/powerpc/platforms/pseries/eeh_driver.c

+ 2 - 1
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;
 }