diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-12 07:47:51 -0500 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-12 07:47:51 -0500 |
commit | b66538014f7eae121afa99ca18488fd67536a1bf (patch) | |
tree | 3d3f60545a04dbf58ca0a789c59922980be92d15 /drivers/block/cciss_scsi.c | |
parent | 6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299 (diff) |
Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"
This reverts commit 978eb516a4e1a1b47163518d6f5d5e81ab27a583.
The commit was broken, relying on other changes that have not been
committed yet.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss_scsi.c')
-rw-r--r-- | drivers/block/cciss_scsi.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 8fa2a2e90b9f..df793803f5ae 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c | |||
@@ -226,13 +226,6 @@ scsi_cmd_stack_setup(ctlr_info_t *h, struct cciss_scsi_adapter_data_t *sa) | |||
226 | return -ENOMEM; | 226 | return -ENOMEM; |
227 | } | 227 | } |
228 | 228 | ||
229 | stk->elem = kmalloc(sizeof(stk->elem[0]) * stk->nelems, GFP_KERNEL); | ||
230 | if (!stk->elem) { | ||
231 | pci_free_consistent(h->pdev, size, stk->pool, | ||
232 | stk->cmd_pool_handle); | ||
233 | return -1; | ||
234 | } | ||
235 | |||
236 | for (i=0; i<CMD_STACK_SIZE; i++) { | 229 | for (i=0; i<CMD_STACK_SIZE; i++) { |
237 | stk->elem[i] = &stk->pool[i]; | 230 | stk->elem[i] = &stk->pool[i]; |
238 | stk->elem[i]->busaddr = (__u32) (stk->cmd_pool_handle + | 231 | stk->elem[i]->busaddr = (__u32) (stk->cmd_pool_handle + |
@@ -262,8 +255,6 @@ scsi_cmd_stack_free(ctlr_info_t *h) | |||
262 | pci_free_consistent(h->pdev, size, stk->pool, stk->cmd_pool_handle); | 255 | pci_free_consistent(h->pdev, size, stk->pool, stk->cmd_pool_handle); |
263 | stk->pool = NULL; | 256 | stk->pool = NULL; |
264 | cciss_free_sg_chain_blocks(sa->cmd_sg_list, CMD_STACK_SIZE); | 257 | cciss_free_sg_chain_blocks(sa->cmd_sg_list, CMD_STACK_SIZE); |
265 | kfree(stk->elem); | ||
266 | stk->elem = NULL; | ||
267 | } | 258 | } |
268 | 259 | ||
269 | #if 0 | 260 | #if 0 |