Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6653801 authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation" 



This reverts commit 978eb516.

The commit was broken, relying on other changes that have not been
committed yet.

Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 6d9a4f9e

drivers/block/cciss_scsi.c

+0 −9
Original line number Diff line number Diff line
@@ -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