diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
| commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
| tree | bf66ccdd613019035ebab535762366aa1026399b /crypto/eseqiv.c | |
| parent | d7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff) | |
| parent | b5c42bc8db17db80917f99205a03c51f17354495 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'crypto/eseqiv.c')
| -rw-r--r-- | crypto/eseqiv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c index 2a342c8e52b3..3ca3b669d5d5 100644 --- a/crypto/eseqiv.c +++ b/crypto/eseqiv.c | |||
| @@ -153,7 +153,8 @@ static int eseqiv_givencrypt(struct skcipher_givcrypt_request *req) | |||
| 153 | if (err) | 153 | if (err) |
| 154 | goto out; | 154 | goto out; |
| 155 | 155 | ||
| 156 | eseqiv_complete2(req); | 156 | if (giv != req->giv) |
| 157 | eseqiv_complete2(req); | ||
| 157 | 158 | ||
| 158 | out: | 159 | out: |
| 159 | return err; | 160 | return err; |