Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161216
b: refs/heads/master
c: 212a502
h: refs/heads/master
v: v3
  • Loading branch information
Eric Dumazet authored and Jens Axboe committed Sep 11, 2009
1 parent 92ca0bd commit 5277069
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 723590ed52d244b025f10a8e2f54c2f57ed02b4d
refs/heads/master: 212a502676c308ead964a024e081529ad3f8d94c
4 changes: 2 additions & 2 deletions trunk/drivers/block/cciss.c
Original file line number Diff line number Diff line change
Expand Up @@ -3889,7 +3889,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
int j = 0;
int rc;
int dac, return_code;
InquiryData_struct *inq_buff = NULL;
InquiryData_struct *inq_buff;

if (reset_devices) {
/* Reset the controller with a PCI power-cycle */
Expand Down Expand Up @@ -4029,6 +4029,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
printk(KERN_WARNING "cciss: unable to determine firmware"
" version of controller\n");
}
kfree(inq_buff);

cciss_procinit(i);

Expand All @@ -4045,7 +4046,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
return 1;

clean4:
kfree(inq_buff);
kfree(hba[i]->cmd_pool_bits);
if (hba[i]->cmd_pool)
pci_free_consistent(hba[i]->pdev,
Expand Down

0 comments on commit 5277069

Please sign in to comment.