Commit 77d4c5da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.19-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:

 - Fix duplicate restart messages in qat

* tag 'v6.19-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - fix duplicate restarting msg during AER error
parents 623fb991 961ac9d9

drivers/crypto/intel/qat/qat_common/adf_aer.c

+0 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ static pci_ers_result_t adf_error_detected(struct pci_dev *pdev, 
	adf_error_notifier(accel_dev);

	adf_pf2vf_notify_fatal_error(accel_dev);

	adf_dev_restarting_notify(accel_dev);

	adf_pf2vf_notify_restarting(accel_dev);

	adf_pf2vf_wait_for_restarting_complete(accel_dev);

	pci_clear_master(pdev);

	adf_dev_down(accel_dev);