summaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss_scsi.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-03-12 13:47:51 +0100
committerJens Axboe <jaxboe@fusionio.com>2011-03-12 13:47:51 +0100
commitb66538014f7eae121afa99ca18488fd67536a1bf (patch)
tree3d3f60545a04dbf58ca0a789c59922980be92d15 /drivers/block/cciss_scsi.c
parent6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299 (diff)
downloadop-kernel-dev-b66538014f7eae121afa99ca18488fd67536a1bf.zip
op-kernel-dev-b66538014f7eae121afa99ca18488fd67536a1bf.tar.gz
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.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 8fa2a2e..df79380 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)
return -ENOMEM;
}
- stk->elem = kmalloc(sizeof(stk->elem[0]) * stk->nelems, GFP_KERNEL);
- if (!stk->elem) {
- pci_free_consistent(h->pdev, size, stk->pool,
- stk->cmd_pool_handle);
- return -1;
- }
-
for (i=0; i<CMD_STACK_SIZE; i++) {
stk->elem[i] = &stk->pool[i];
stk->elem[i]->busaddr = (__u32) (stk->cmd_pool_handle +
@@ -262,8 +255,6 @@ scsi_cmd_stack_free(ctlr_info_t *h)
pci_free_consistent(h->pdev, size, stk->pool, stk->cmd_pool_handle);
stk->pool = NULL;
cciss_free_sg_chain_blocks(sa->cmd_sg_list, CMD_STACK_SIZE);
- kfree(stk->elem);
- stk->elem = NULL;
}
#if 0
OpenPOWER on IntegriCloud