diff options
| author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 01:01:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 07:54:05 -0800 |
| commit | 6044ec8882c726e325017bd948aa0cd94ad33abc (patch) | |
| tree | 3bfc5dc93434e8ad556540f6689abcd2699aa45d /drivers/block/cciss.c | |
| parent | 2ea7533060e361810c21b2f5ee02151c4dfb85d8 (diff) | |
[PATCH] kfree cleanup: misc remaining drivers
This is the remaining misc drivers/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in misc files in
drivers/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
Acked-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Acked-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Len Brown <len.brown@intel.com>
Acked-by: "Antonino A. Daplas" <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 486b6e1c7df..a97c80b5773 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1096,14 +1096,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, cleanup1: if (buff) { for(i=0; i<sg_used; i++) - if(buff[i] != NULL) - kfree(buff[i]); + kfree(buff[i]); kfree(buff); } - if (buff_size) - kfree(buff_size); - if (ioc) - kfree(ioc); + kfree(buff_size); + kfree(ioc); return(status); } default: @@ -3034,8 +3031,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, return(1); clean4: - if(hba[i]->cmd_pool_bits) - kfree(hba[i]->cmd_pool_bits); + kfree(hba[i]->cmd_pool_bits); if(hba[i]->cmd_pool) pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct), |