aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-08-24 04:01:53 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-09-11 08:34:33 -0400
commit212a502676c308ead964a024e081529ad3f8d94c (patch)
tree5dd856c710db4c2a28998144e863cb68810da00a /drivers/block
parent723590ed52d244b025f10a8e2f54c2f57ed02b4d (diff)
cciss: memory leak in cciss_init_one()
commit 22bece00dc1f28dd3374c55e464c9f02eb642876 (cciss: fix regression firmware not displayed in procfs) added a small memory leak in cciss_init_one() Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a52cc7fe45ea..0589dfbbd7db 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3889,7 +3889,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
3889 int j = 0; 3889 int j = 0;
3890 int rc; 3890 int rc;
3891 int dac, return_code; 3891 int dac, return_code;
3892 InquiryData_struct *inq_buff = NULL; 3892 InquiryData_struct *inq_buff;
3893 3893
3894 if (reset_devices) { 3894 if (reset_devices) {
3895 /* Reset the controller with a PCI power-cycle */ 3895 /* Reset the controller with a PCI power-cycle */
@@ -4029,6 +4029,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
4029 printk(KERN_WARNING "cciss: unable to determine firmware" 4029 printk(KERN_WARNING "cciss: unable to determine firmware"
4030 " version of controller\n"); 4030 " version of controller\n");
4031 } 4031 }
4032 kfree(inq_buff);
4032 4033
4033 cciss_procinit(i); 4034 cciss_procinit(i);
4034 4035
@@ -4045,7 +4046,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
4045 return 1; 4046 return 1;
4046 4047
4047clean4: 4048clean4:
4048 kfree(inq_buff);
4049 kfree(hba[i]->cmd_pool_bits); 4049 kfree(hba[i]->cmd_pool_bits);
4050 if (hba[i]->cmd_pool) 4050 if (hba[i]->cmd_pool)
4051 pci_free_consistent(hba[i]->pdev, 4051 pci_free_consistent(hba[i]->pdev,