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

Commit 7b42d97e authored by Keith Busch's avatar Keith Busch Committed by Bjorn Helgaas
Browse files

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: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarSinan Kaya <okaya@kernel.org>
parent 542aeb9c

drivers/pci/pcie/err.c

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

}