---

yaml --- r: 142121 b: refs/heads/master c: fd6e1c1 h: refs/heads/master i: 142119: 76d457e v: v3
git-mirror · Apr 3, 2009 · b011efc · b011efc
1 parent db88b3a
commit b011efc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b2639d59afe0a30e1b955b23c52ee9099888058
+refs/heads/master: fd6e1c14b73dbab89cb76af895d5612e4a8b5522
diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c
@@ -1999,8 +1999,10 @@ iscsi_pool_init(struct iscsi_pool *q, int max, void ***items, int item_size)
 
 	q->queue = kfifo_init((void*)q->pool, max * sizeof(void*),
 			      GFP_KERNEL, NULL);
-	if (q->queue == ERR_PTR(-ENOMEM))
+	if (IS_ERR(q->queue)) {
+		q->queue = NULL;
 		goto enomem;
+	}
 
 	for (i = 0; i < max; i++) {
 		q->pool[i] = kzalloc(item_size, GFP_KERNEL);