PCI/ERR: Always report current recovery status for udev

A device still participates in error recovery even if it doesn't have
the error callbacks.

Always provide the status for user event watchers.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Sinan Kaya <okaya@kernel.org>

diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index 362a717c831a3c72c17f6353001c23f25b5b51c3..31e8a4314384440e4e4dfe7c843425e1e11cfd44 100644 (file)
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -70,9 +70,8 @@ static int report_error_detected(struct pci_dev *dev,
        } else {
                err_handler = dev->driver->err_handler;
                vote = err_handler->error_detected(dev, state);
-               pci_uevent_ers(dev, PCI_ERS_RESULT_NONE);
        }
-
+       pci_uevent_ers(dev, vote);
        *result = merge_result(*result, vote);
        device_unlock(&dev->dev);
        return 0;
@@ -140,8 +139,8 @@ static int report_resume(struct pci_dev *dev, void *data)
 
        err_handler = dev->driver->err_handler;
        err_handler->resume(dev);
-       pci_uevent_ers(dev, PCI_ERS_RESULT_RECOVERED);
 out:
+       pci_uevent_ers(dev, PCI_ERS_RESULT_RECOVERED);
        device_unlock(&dev->dev);
        return 0;
 }