From b011efc2bfa6f47e3d454e90f0e73ea3f518f8f4 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Wed, 1 Apr 2009 13:11:29 -0500
Subject: [PATCH] --- yaml --- r: 142121 b: refs/heads/master c:
 fd6e1c14b73dbab89cb76af895d5612e4a8b5522 h: refs/heads/master i:   142119:
 76d457e0cb4d4b47aeb3aaaf121a1982ecf434a2 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/libiscsi.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ac4a4fa3f5ef..dd84541c8898 100644
--- 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
index dfaa8adf099e..689628359169 100644
--- 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);