2 files changed, 3 insertions, 5 deletions

diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 0ca92d414667..68be7d08aeb3 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -315,7 +315,7 @@ geode_cbc_decrypt(struct blkcipher_desc *desc,
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
         err = blkcipher_walk_virt(desc, &walk);
-        memcpy(op->iv, walk.iv, AES_IV_LENGTH);
+        op->iv = walk.iv;
 
         while((nbytes = walk.nbytes)) {
                 op->src = walk.src.virt.addr,
@@ -330,7 +330,6 @@ geode_cbc_decrypt(struct blkcipher_desc *desc,
                 err = blkcipher_walk_done(desc, &walk, nbytes);
         }
 
-        memcpy(walk.iv, op->iv, AES_IV_LENGTH);
         return err;
 }
 
@@ -348,7 +347,7 @@ geode_cbc_encrypt(struct blkcipher_desc *desc,
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
         err = blkcipher_walk_virt(desc, &walk);
-        memcpy(op->iv, walk.iv, AES_IV_LENGTH);
+        op->iv = walk.iv;
 
         while((nbytes = walk.nbytes)) {
                 op->src = walk.src.virt.addr,
@@ -362,7 +361,6 @@ geode_cbc_encrypt(struct blkcipher_desc *desc,
                 err = blkcipher_walk_done(desc, &walk, nbytes);
         }
 
-        memcpy(walk.iv, op->iv, AES_IV_LENGTH);
         return err;
 }
 
diff --git a/drivers/crypto/geode-aes.h b/drivers/crypto/geode-aes.h
index 14cc763da1e4..f1855b50da48 100644
--- a/drivers/crypto/geode-aes.h
+++ b/drivers/crypto/geode-aes.h
@@ -65,7 +65,7 @@ struct geode_aes_op {
         int len;
 
         u8 key[AES_KEY_LENGTH];
-        u8 iv[AES_IV_LENGTH];
+        u8 *iv;
 
         union {
                 struct crypto_blkcipher *blk;