From 4371843977d0fb4cba08ff962243063a6529e5e7 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sat, 12 Mar 2011 13:47:51 +0100 Subject: [PATCH] --- yaml --- r: 242923 b: refs/heads/master c: b66538014f7eae121afa99ca18488fd67536a1bf h: refs/heads/master i: 242921: 6e8680abcff46a326a0cd04d1fcd96feb15bb2eb 242919: ef8bfbf988485f598c6d9931b7297d4f8f910cc0 v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss_scsi.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e5784923c833..c94d7829624b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299 +refs/heads/master: b66538014f7eae121afa99ca18488fd67536a1bf diff --git a/trunk/drivers/block/cciss_scsi.c b/trunk/drivers/block/cciss_scsi.c index 8fa2a2e90b9f..df793803f5ae 100644 --- a/trunk/drivers/block/cciss_scsi.c +++ b/trunk/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; ielem[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