Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / arch / powerpc / kernel / eeh.c

diff --git a/kernel/arch/powerpc/kernel/eeh.c b/kernel/arch/powerpc/kernel/eeh.c
index 40e4d4a..98949b0 100644 (file)
--- a/kernel/arch/powerpc/kernel/eeh.c
+++ b/kernel/arch/powerpc/kernel/eeh.c
@@ -677,7 +677,7 @@ int eeh_pci_enable(struct eeh_pe *pe, int function)
        /* Check if the request is finished successfully */
        if (active_flag) {
                rc = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);
-               if (rc <= 0)
+               if (rc < 0)
                        return rc;
 
                if (rc & active_flag)
@@ -1072,7 +1072,7 @@ void eeh_add_device_early(struct pci_dn *pdn)
        struct pci_controller *phb;
        struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
 
-       if (!edev || !eeh_enabled())
+       if (!edev)
                return;
 
        if (!eeh_has_flag(EEH_PROBE_MODE_DEVTREE))