Commit 3660f251 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Herbert Xu
Browse files

crypto: qat - disable AER if an error occurs in probe functions 



If an error occurs after a 'adf_enable_aer()' call, it must be undone by a
corresponding 'adf_disable_aer()' call, as already done in the remove
function.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ae1f5043

drivers/crypto/qat/qat_c3xxx/adf_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (pci_save_state(pdev)) {

		dev_err(&pdev->dev, "Failed to save pci state\n");

		ret = -ENOMEM;

		goto out_err_free_reg;

		goto out_err_disable_aer;

	}



	ret = qat_crypto_dev_config(accel_dev);

	if (ret)

		goto out_err_free_reg;

		goto out_err_disable_aer;



	ret = adf_dev_init(accel_dev);

	if (ret)
@@ -222,6 +222,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

out_err_disable_aer:

	adf_disable_aer(accel_dev);

out_err_free_reg:

	pci_release_regions(accel_pci_dev->pci_dev);

out_err_disable:

drivers/crypto/qat/qat_c62x/adf_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (pci_save_state(pdev)) {

		dev_err(&pdev->dev, "Failed to save pci state\n");

		ret = -ENOMEM;

		goto out_err_free_reg;

		goto out_err_disable_aer;

	}



	ret = qat_crypto_dev_config(accel_dev);

	if (ret)

		goto out_err_free_reg;

		goto out_err_disable_aer;



	ret = adf_dev_init(accel_dev);

	if (ret)
@@ -222,6 +222,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

out_err_disable_aer:

	adf_disable_aer(accel_dev);

out_err_free_reg:

	pci_release_regions(accel_pci_dev->pci_dev);

out_err_disable:

drivers/crypto/qat/qat_dh895xcc/adf_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (pci_save_state(pdev)) {

		dev_err(&pdev->dev, "Failed to save pci state\n");

		ret = -ENOMEM;

		goto out_err_free_reg;

		goto out_err_disable_aer;

	}



	ret = qat_crypto_dev_config(accel_dev);

	if (ret)

		goto out_err_free_reg;

		goto out_err_disable_aer;



	ret = adf_dev_init(accel_dev);

	if (ret)
@@ -222,6 +222,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adf_dev_stop(accel_dev);

out_err_dev_shutdown:

	adf_dev_shutdown(accel_dev);

out_err_disable_aer:

	adf_disable_aer(accel_dev);

out_err_free_reg:

	pci_release_regions(accel_pci_dev->pci_dev);

out_err_disable: