diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-04-28 01:13:03 (GMT) |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-04-28 01:13:03 (GMT) |
| commit | 6f6438975d6a1afb0f0ac18176ede4e667020db0 (patch) | |
| tree | 11b7ee504210dd7ce7bb3318c1aabbf60759c717 /drivers/crypto/qat/qat_common/adf_ctl_drv.c | |
| parent | 79152e8d085fd64484afd473ef6830b45518acba (diff) | |
| parent | 9e209fcfb804da262e38e5cd2e680c47a41f0f95 (diff) | |
| download | linux-6f6438975d6a1afb0f0ac18176ede4e667020db0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in the qat adf_init_pf_wq change.
Diffstat (limited to 'drivers/crypto/qat/qat_common/adf_ctl_drv.c')
| -rw-r--r-- | drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c index 116ddda..db21b49 100644 --- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c +++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c @@ -471,6 +471,9 @@ static int __init adf_register_ctl_device_driver(void) if (adf_init_aer()) goto err_aer; + if (adf_init_pf_wq()) + goto err_pf_wq; + if (adf_init_vf_wq()) goto err_vf_wq; @@ -482,6 +485,8 @@ static int __init adf_register_ctl_device_driver(void) err_crypto_register: adf_exit_vf_wq(); err_vf_wq: + adf_exit_pf_wq(); +err_pf_wq: adf_exit_aer(); err_aer: adf_chr_drv_destroy(); @@ -495,6 +500,7 @@ static void __exit adf_unregister_ctl_device_driver(void) adf_chr_drv_destroy(); adf_exit_aer(); adf_exit_vf_wq(); + adf_exit_pf_wq(); qat_crypto_unregister(); adf_clean_vf_map(false); mutex_destroy(&adf_ctl_lock); |