Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136309
b: refs/heads/master
c: f474a37
h: refs/heads/master
i:
  136307: 899fc73
v: v3
  • Loading branch information
Jean Delvare authored and James Bottomley committed Mar 13, 2009
1 parent b865ce1 commit fe06aae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07c00ec449d4d94042063a6900d7d04fdc9f8e62
refs/heads/master: f474a37bc48667595b5653a983b635c95ed82a3b
5 changes: 2 additions & 3 deletions trunk/drivers/scsi/libiscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1944,7 +1944,7 @@ iscsi_pool_init(struct iscsi_pool *q, int max, void ***items, int item_size)
num_arrays++;
q->pool = kzalloc(num_arrays * max * sizeof(void*), GFP_KERNEL);
if (q->pool == NULL)
goto enomem;
return -ENOMEM;

q->queue = kfifo_init((void*)q->pool, max * sizeof(void*),
GFP_KERNEL, NULL);
Expand Down Expand Up @@ -1979,8 +1979,7 @@ void iscsi_pool_free(struct iscsi_pool *q)

for (i = 0; i < q->max; i++)
kfree(q->pool[i]);
if (q->pool)
kfree(q->pool);
kfree(q->pool);
kfree(q->queue);
}
EXPORT_SYMBOL_GPL(iscsi_pool_free);
Expand Down

0 comments on commit fe06aae

Please sign in to comment.