diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:06 -0500 |
commit | b2325fe1b7e5654fac9e9419423aa2c58a3dbd83 (patch) | |
tree | 934555b25ef9b33d3c4242b5dafb49ee8931e993 /arch/cris/arch-v32/drivers | |
parent | f99d49adf527fa6f7a9c42257fa76bca6b8df1e3 (diff) |
[PATCH] kfree cleanup: arch
This is the arch/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in arch/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/cris/arch-v32/drivers')
-rw-r--r-- | arch/cris/arch-v32/drivers/cryptocop.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c index ca72076c630a..501fa52d8d3a 100644 --- a/arch/cris/arch-v32/drivers/cryptocop.c +++ b/arch/cris/arch-v32/drivers/cryptocop.c | |||
@@ -277,7 +277,7 @@ struct file_operations cryptocop_fops = { | |||
277 | static void free_cdesc(struct cryptocop_dma_desc *cdesc) | 277 | static void free_cdesc(struct cryptocop_dma_desc *cdesc) |
278 | { | 278 | { |
279 | DEBUG(printk("free_cdesc: cdesc 0x%p, from_pool=%d\n", cdesc, cdesc->from_pool)); | 279 | DEBUG(printk("free_cdesc: cdesc 0x%p, from_pool=%d\n", cdesc, cdesc->from_pool)); |
280 | if (cdesc->free_buf) kfree(cdesc->free_buf); | 280 | kfree(cdesc->free_buf); |
281 | 281 | ||
282 | if (cdesc->from_pool) { | 282 | if (cdesc->from_pool) { |
283 | unsigned long int flags; | 283 | unsigned long int flags; |
@@ -2950,15 +2950,15 @@ static int cryptocop_ioctl_process(struct inode *inode, struct file *filp, unsig | |||
2950 | put_page(outpages[i]); | 2950 | put_page(outpages[i]); |
2951 | } | 2951 | } |
2952 | 2952 | ||
2953 | if (digest_result) kfree(digest_result); | 2953 | kfree(digest_result); |
2954 | if (inpages) kfree(inpages); | 2954 | kfree(inpages); |
2955 | if (outpages) kfree(outpages); | 2955 | kfree(outpages); |
2956 | if (cop){ | 2956 | if (cop){ |
2957 | if (cop->tfrm_op.indata) kfree(cop->tfrm_op.indata); | 2957 | kfree(cop->tfrm_op.indata); |
2958 | if (cop->tfrm_op.outdata) kfree(cop->tfrm_op.outdata); | 2958 | kfree(cop->tfrm_op.outdata); |
2959 | kfree(cop); | 2959 | kfree(cop); |
2960 | } | 2960 | } |
2961 | if (jc) kfree(jc); | 2961 | kfree(jc); |
2962 | 2962 | ||
2963 | DEBUG(print_lock_status()); | 2963 | DEBUG(print_lock_status()); |
2964 | 2964 | ||