diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-10-02 10:37:20 +0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-10-02 10:37:20 +0400 |
| commit | 9561dccb45a34f77001389824915e4dad8ede757 (patch) | |
| tree | a16454e64e00c3ea4e42719ecb3b1035da9c463b /drivers/crypto/ccp/ccp-crypto-main.c | |
| parent | e3b3bb5ac1438354635c3879ce31cbdeebe55857 (diff) | |
| parent | 7da4b29d496b1389d3a29b55d3668efecaa08ebd (diff) | |
| download | linux-9561dccb45a34f77001389824915e4dad8ede757.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merging the crypto tree for 3.17 to pull in the "by8" AVX CTR revert.
Diffstat (limited to 'drivers/crypto/ccp/ccp-crypto-main.c')
| -rw-r--r-- | drivers/crypto/ccp/ccp-crypto-main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/crypto/ccp/ccp-crypto-main.c b/drivers/crypto/ccp/ccp-crypto-main.c index 20dc848481e7..4d4e016d755b 100644 --- a/drivers/crypto/ccp/ccp-crypto-main.c +++ b/drivers/crypto/ccp/ccp-crypto-main.c @@ -367,6 +367,10 @@ static int ccp_crypto_init(void) { int ret; + ret = ccp_present(); + if (ret) + return ret; + spin_lock_init(&req_queue_lock); INIT_LIST_HEAD(&req_queue.cmds); req_queue.backlog = &req_queue.cmds; |