mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"
This reverts commit 978eb516a4
.
The commit was broken, relying on other changes that have not been
committed yet.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
parent
6d9a4f9e21
commit
b66538014f
1 changed files with 0 additions and 9 deletions
|
@ -226,13 +226,6 @@ scsi_cmd_stack_setup(ctlr_info_t *h, struct cciss_scsi_adapter_data_t *sa)
|
||||||
return -ENOMEM;
|
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++) {
|
for (i=0; i<CMD_STACK_SIZE; i++) {
|
||||||
stk->elem[i] = &stk->pool[i];
|
stk->elem[i] = &stk->pool[i];
|
||||||
stk->elem[i]->busaddr = (__u32) (stk->cmd_pool_handle +
|
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);
|
pci_free_consistent(h->pdev, size, stk->pool, stk->cmd_pool_handle);
|
||||||
stk->pool = NULL;
|
stk->pool = NULL;
|
||||||
cciss_free_sg_chain_blocks(sa->cmd_sg_list, CMD_STACK_SIZE);
|
cciss_free_sg_chain_blocks(sa->cmd_sg_list, CMD_STACK_SIZE);
|
||||||
kfree(stk->elem);
|
|
||||||
stk->elem = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|
Loading…
Reference in a new issue