diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-04 11:32:40 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-04 11:32:40 -0800 |
| commit | 2db18d12ffa4131d398564bfc0fb15f26cdf52e5 (patch) | |
| tree | e23eae0884d78fba55a41668cf809ae3ecd61159 /crypto/blkcipher.c | |
| parent | cc6c016e15be5b8f5130d170fb6a0f10f2722e4f (diff) | |
| parent | 874fbf3b2b51ca47c6a69a8e8ec5e8480c492478 (diff) | |
| download | linux-crypto-2db18d12ffa4131d398564bfc0fb15f26cdf52e5.tar.gz linux-crypto-2db18d12ffa4131d398564bfc0fb15f26cdf52e5.zip | |
Merge branch 'rotary-encoder' into next
Bring in updates to roraty encoder driver switching it away from legacy
platform data and over to generic device properties and adding support
for encoders using more than 2 GPIOs.
Diffstat (limited to 'crypto/blkcipher.c')
| -rw-r--r-- | crypto/blkcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 11b98149..8cc1622b 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -326,12 +326,12 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc, if (WARN_ON_ONCE(in_irq())) return -EDEADLK; + walk->iv = desc->info; walk->nbytes = walk->total; if (unlikely(!walk->total)) return 0; walk->buffer = NULL; - walk->iv = desc->info; if (unlikely(((unsigned long)walk->iv & walk->alignmask))) { int err = blkcipher_copy_iv(walk); if (err) |