diff options
author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /drivers/md/dm-crypt.c | |
parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'drivers/md/dm-crypt.c')
-rw-r--r-- | drivers/md/dm-crypt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 0dd6c2b5391b..d0a4bab220e5 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -704,8 +704,7 @@ static void crypt_dtr(struct dm_target *ti) | |||
704 | mempool_destroy(cc->page_pool); | 704 | mempool_destroy(cc->page_pool); |
705 | mempool_destroy(cc->io_pool); | 705 | mempool_destroy(cc->io_pool); |
706 | 706 | ||
707 | if (cc->iv_mode) | 707 | kfree(cc->iv_mode); |
708 | kfree(cc->iv_mode); | ||
709 | if (cc->iv_gen_ops && cc->iv_gen_ops->dtr) | 708 | if (cc->iv_gen_ops && cc->iv_gen_ops->dtr) |
710 | cc->iv_gen_ops->dtr(cc); | 709 | cc->iv_gen_ops->dtr(cc); |
711 | crypto_free_tfm(cc->tfm); | 710 | crypto_free_tfm(cc->tfm); |