[POWERPC] EEH: modify order of EEH state checking

Change the order in which pci error state is examined;
the "capabilites" is not valid if "reset state" is 5.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 6cedbc002e0f..3d9f5c1113aa 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -367,6 +367,14 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                 goto dn_unlock;
         }
 
+        /* Note that config-io to empty slots may fail;
+         * they are empty when they don't have children. */
+        if ((rets[0] == 5) && (dn->child == NULL)) {
+                false_positives++;
+                rc = 0;
+                goto dn_unlock;
+        }
+
         /* If EEH is not supported on this device, punt. */
         if (rets[1] != 1) {
                 printk(KERN_WARNING "EEH: event on unsupported device, rc=%d dn=%s\n",
@@ -383,14 +391,6 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                 goto dn_unlock;
         }
 
-        /* Note that config-io to empty slots may fail;
-         * we recognize empty because they don't have children. */
-        if ((rets[0] == 5) && (dn->child == NULL)) {
-                false_positives++;
-                rc = 0;
-                goto dn_unlock;
-        }
-
         slot_resets++;
  
         /* Avoid repeated reports of this failure, including problems